From 0d703c73bd27147c94e2c5a67eeb115f448fbd70 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 1 Aug 2014 13:16:26 +0400 Subject: [PATCH] reinstate wrongfully renamed archived feed; properly fix prefs filtertree labels for all feeds (ff5cc7d7) --- classes/pref/filters.php | 4 +++- include/functions.php | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/pref/filters.php b/classes/pref/filters.php index cfc20e41..170c1a52 100644 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -164,7 +164,9 @@ class Pref_Filters extends Handler_Protected { while ($line = $this->dbh->fetch_assoc($result)) { $where = sql_bool_to_bool($line["cat_filter"]) ? - getCategoryTitle($line["cat_id"]) : getFeedTitle($line["feed_id"]); + getCategoryTitle($line["cat_id"]) : + ($line["feed_id"] ? + getFeedTitle($line["feed_id"]) : __("All feeds")); # $where = $line["cat_id"] . "/" . $line["feed_id"]; diff --git a/include/functions.php b/include/functions.php index cb91b637..8d07acf5 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1972,8 +1972,6 @@ function getFeedTitle($id, $cat = false) { if ($cat) { return getCategoryTitle($id); - } else if ($id == 0) { - return __("All feeds"); } else if ($id == -1) { return __("Starred articles"); } else if ($id == -2) { -- 2.39.2