valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Andrew Dolgov 2014-08-01 13:16:26 +04:00
parent 0e21b0b475
commit 0d703c73bd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/pref/filters.php
View File

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

2
include/functions.php
View File

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