diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index ab280a98e9a8eb67fd8c0d5e4d1659b5c0337a50..da3a962827816763d01db9be86b2154160e5d101 100644 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -36,8 +36,7 @@ class Pref_Feeds extends Handler_Protected { // first one is set by API $show_empty_cats = $_REQUEST['force_show_empty'] || - ($_REQUEST['mode'] != 2 && !$search && - get_pref('_PREFS_SHOW_EMPTY_CATS')); + ($_REQUEST['mode'] != 2 && !$search); $items = array(); @@ -185,8 +184,7 @@ class Pref_Feeds extends Handler_Protected { if ($enable_cats) { $show_empty_cats = $_REQUEST['force_show_empty'] || - ($_REQUEST['mode'] != 2 && !$search && - get_pref('_PREFS_SHOW_EMPTY_CATS')); + ($_REQUEST['mode'] != 2 && !$search); $result = $this->dbh->query("SELECT id, title FROM ttrss_feed_categories WHERE owner_uid = " . $_SESSION["uid"] . " AND parent_cat IS NULL ORDER BY order_id, title"); @@ -305,11 +303,6 @@ class Pref_Feeds extends Handler_Protected { return; } - function togglehiddenfeedcats() { - set_pref('_PREFS_SHOW_EMPTY_CATS', - (get_pref('_PREFS_SHOW_EMPTY_CATS') ? 'false' : 'true')); - } - private function process_category_order(&$data_map, $item_id, $parent_id = false, $nest_level = 0) { $debug = isset($_REQUEST["debug"]); @@ -1351,9 +1344,6 @@ class Pref_Feeds extends Handler_Protected { print $error_button; print $inactive_button; - print "<button onclick=\"toggleHiddenFeedCats()\" - dojoType=\"dijit.form.Button\">".__('(Un)hide empty categories')."</button>"; - if (defined('_ENABLE_FEED_DEBUGGING')) { print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\"> diff --git a/js/prefs.js b/js/prefs.js index 4346054ef68e3c3374cf36f16f8ac526acc368e8..e226459fc24fa0386b479ea53e20b464256b6560 100644 --- a/js/prefs.js +++ b/js/prefs.js @@ -1610,21 +1610,6 @@ function resetCatOrder() { } } -function toggleHiddenFeedCats() { - try { - notify_progress("Loading, please wait..."); - - new Ajax.Request("backend.php", { - parameters: "?op=pref-feeds&method=togglehiddenfeedcats", - onComplete: function(transport) { - updateFeedList(); - } }); - - } catch (e) { - exception_error("toggleHiddenFeedCats"); - } -} - function editCat(id, item, event) { try { var new_name = prompt(__('Rename category to:'), item.name);