pass activeFeedIsCat() to search dialog when called from hotkey

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 1dc381979ed2b713d3aa1d592946402b403c06a2..be178207a3837de7a193c51ec47a6cc9df309a7c 100644 (file)
--- 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 47b2a14cb87e2b7587310ee1a76308849aecf653..4fe94817970917ab047bbf64e39e6ff10ef8b56d 100644 (file)
--- 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