reinstate wrongfully renamed archived feed; properly fix prefs filtertree labels for all feeds (ff5cc7d7)

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"];
 

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) {