diff options
author | Andrew Dolgov <[email protected]> | 2015-07-13 12:46:05 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-07-13 12:46:05 +0300 |
commit | 4f9a3c0e0f995b5ad8eed5357df3d12beb8bee00 (patch) | |
tree | 43b8e2eb0757095b80ed877ae1c379b7f0463f2e /classes/pref | |
parent | c939dfc39645f6fd687dd926c50286eda4b2c2df (diff) | |
parent | 402073d6a1845f5874da67aa055e733cd2ae693a (diff) |
Merge branch 'master' of git.fakecake.org:tt-rss
Conflicts:
classes/pref/filters.php
Diffstat (limited to 'classes/pref')
-rw-r--r-- | classes/pref/filters.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/classes/pref/filters.php b/classes/pref/filters.php index 6e8f4630c..0e887c426 100644 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -114,6 +114,7 @@ class Pref_Filters extends Handler_Protected { $result = db_query("SELECT ttrss_entries.id, ttrss_entries.title, ttrss_feeds.id AS feed_id, + ttrss_feeds.title AS feed_title, ttrss_feed_categories.id AS cat_id, content, link, @@ -152,7 +153,7 @@ class Pref_Filters extends Handler_Protected { checked=\"1\" disabled=\"1\" type=\"checkbox\"></td>"; print "<td>"; - foreach ($filter['rules'] as $rule) { + /*foreach ($filter['rules'] as $rule) { $reg_exp = $rule['reg_exp']; $reg_exp = str_replace('/', '\/', $rule["reg_exp"]); @@ -161,7 +162,7 @@ class Pref_Filters extends Handler_Protected { $content_preview = preg_replace("/($reg_exp)/i", "<span class=\"highlight\">$1</span>", $content_preview); - } + }*/ print $line["title"]; print " ("; |