valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #381 from bram85/master 

Fix for testing filters getting stuck sometimes.
This commit is contained in:
Andrew Dolgov 2014-06-19 14:56:42 +04:00
parent 32ae0fc2a2 7b3110c9c9
commit ace47aefa7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/functions2.php
View File

@ -426,8 +426,10 @@
// Try to check if SQL regexp implementation chokes on a valid regexp
$result = db_query("SELECT true AS true_val FROM ttrss_entries,
ttrss_user_entries, ttrss_feeds
$result = db_query("SELECT true AS true_val
FROM ttrss_entries
JOIN ttrss_user_entries ON ttrss_entries.id = ttrss_user_entries.ref_id
JOIN ttrss_feeds ON ttrss_feeds.id = ttrss_user_entries.feed_id
WHERE $filter_query_part LIMIT 1", false);
if ($result) {