From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 13 Sep 2012 08:54:11 +0000 (+0400)
Subject: pref-feeds: disable show empty cats when searching
X-Git-Tag: 1.6.0~46
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=f393dc6fb260de3ed0d5faf29ea9bb053a1bf337;p=tt-rss.git

pref-feeds: disable show empty cats when searching
---

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 77622d53..9dc2f7e6 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