From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Fri, 16 May 2008 07:45:38 +0000 (+0100)
Subject: pass activeFeedIsCat() to search dialog when called from hotkey
X-Git-Tag: 1.2.23-final~114
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=525ea55e482173ca91755cb933a9979fdecd3712;p=tt-rss.git

pass activeFeedIsCat() to search dialog when called from hotkey
---

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 1dc38197..be178207 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -131,6 +131,8 @@
 
 			#$active_feed_id = db_escape_string($_GET["param"]);
 
+			print $_GET["param"];
+
 			$params = split(":", db_escape_string($_GET["param"]));
 
 			$active_feed_id = sprintf("%d", $params[0]);
diff --git a/tt-rss.js b/tt-rss.js
index 47b2a14c..4fe94817 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -972,7 +972,7 @@ function hotkey_handler(e) {
 			}
 	
 			if (keycode == 191) { // /
-				return displayDlg("search", getActiveFeedId());
+				return displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat());
 			}
 
 			if (keycode == 74) { // j