From b684a2e6654ef749832f60f4c4243a42e4f583a8 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 13 Jun 2013 14:51:31 +0400 Subject: [PATCH] fix crash on feedlist collapse, do not use _COLLAPSED_FEEDLIST pref --- include/functions.php | 1 - js/tt-rss.js | 5 ----- 2 files changed, 6 deletions(-) diff --git a/include/functions.php b/include/functions.php index f05b5cb4..344d66ae 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1966,7 +1966,6 @@ $params["max_feed_id"] = (int) $max_feed_id; $params["num_feeds"] = (int) $num_feeds; - $params["collapsed_feedlist"] = (int) get_pref("_COLLAPSED_FEEDLIST"); $params["hotkeys"] = get_hotkeys_map(); $params["csrf_token"] = $_SESSION["csrf_token"]; diff --git a/js/tt-rss.js b/js/tt-rss.js index 9a6db235..ee3156c2 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -789,19 +789,14 @@ function collapse_feedlist() { if (!Element.visible('feeds-holder')) { Element.show('feeds-holder'); - Element.show('feeds-holder_splitter'); $("collapse_feeds_btn").innerHTML = "<<"; } else { Element.hide('feeds-holder'); - Element.hide('feeds-holder_splitter'); $("collapse_feeds_btn").innerHTML = ">>"; } dijit.byId("main").resize(); - query = "?op=rpc&method=setpref&key=_COLLAPSED_FEEDLIST&value=true"; - new Ajax.Request("backend.php", { parameters: query }); - } catch (e) { exception_error("collapse_feedlist", e); } -- 2.39.5