remove search toolbar

diff --git a/modules/pref-prefs.php b/modules/pref-prefs.php
index 7d1c95d491c82585d80bf4f3eff85eb03faa7932..7450106a51576914bd155a4fe791eb443bd9253d 100644 (file)
--- a/modules/pref-prefs.php
+++ b/modules/pref-prefs.php
@@ -13,7 +13,8 @@
 
                $subop = $_REQUEST["subop"];
 
-               $prefs_blacklist = array("HIDE_FEEDLIST", "SYNC_COUNTERS", "ENABLE_LABELS");
+               $prefs_blacklist = array("HIDE_FEEDLIST", "SYNC_COUNTERS", "ENABLE_LABELS",
+                       "ENABLE_SEARCH_TOOLBAR");
 
                if (FORCE_ARTICLE_PURGE != 0) {
                        array_push($prefs_blacklist, "PURGE_OLD_DAYS");

diff --git a/tt-rss.php b/tt-rss.php
index eb607a20d8c9ed85090ccea701c5bc54e7c70486..5c216748e628bc88fe2ed4c15a741d2d31c9ddcf 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -217,15 +217,6 @@
 
                 
 
-               <?php if (get_pref($link, 'ENABLE_SEARCH_TOOLBAR')) { ?>
-
-               <?php echo __('Search:') ?>
-               <input name="query" type="text"
-                       onkeypress="return filterCR(event, viewCurrentFeed)"
-                       onblur="javascript:enableHotkeys();" onfocus="javascript:disableHotkeys();"/>
-
-               <?php } ?>
-
                <select name="view_mode" title="<?php echo __('Show articles') ?>" 
                                onchange="viewModeChanged()">
                        <option selected="selected" value="adaptive"><?php echo __('Adaptive') ?></option>