reinstate wrongfully renamed archived feed; properly fix prefs filtertree labels...

diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index cfc20e4192fa7f38c7150a5034e8f67604d21387..170c1a5277bedd7fb378c23e27102e3cf019970a 100644 (file)
--- 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 cb91b637e1bfcb534ef8f8421afa6c2c0a8cdc73..8d07acf5a439916e06e2b516952158d3264cfde9 100644 (file)
--- 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) {