summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2012-09-13 12:54:11 +0400
committerAndrew Dolgov <[email protected]>2012-09-13 12:54:11 +0400
commitf393dc6fb260de3ed0d5faf29ea9bb053a1bf337 (patch)
tree812028b0cad3d58d94886999cb8d417ce1f19215
parent17c755f048cf32fcd4351000d17f1db720fdceb5 (diff)
pref-feeds: disable show empty cats when searching
-rw-r--r--classes/pref/feeds.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 77622d533..9dc2f7e6a 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -29,7 +29,7 @@ class Pref_Feeds extends Handler_Protected {
if ($search) $search_qpart = " AND LOWER(title) LIKE LOWER('%$search%')";
- $show_empty_cats = $_REQUEST['mode'] != 2 &&
+ $show_empty_cats = $_REQUEST['mode'] != 2 && !$search &&
get_pref($this->link, '_PREFS_SHOW_EMPTY_CATS');
$items = array();
@@ -150,7 +150,7 @@ class Pref_Feeds extends Handler_Protected {
}
if ($enable_cats) {
- $show_empty_cats = $_REQUEST['mode'] != 2 &&
+ $show_empty_cats = $_REQUEST['mode'] != 2 && !$search &&
get_pref($this->link, '_PREFS_SHOW_EMPTY_CATS');
$result = db_query($this->link, "SELECT id, title, collapsed FROM ttrss_feed_categories