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

Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS

This commit is contained in:
Andrew Dolgov 2012-09-02 13:46:05 +04:00
parent 3b003f6396 8592a8e3b2
commit d7f9e4fc08
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/opml.php
View File

@ -165,7 +165,7 @@ class Opml extends Handler_Protected {
WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY id"); WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY id");
while ($line = db_fetch_assoc($result)) { while ($line = db_fetch_assoc($result)) {
foreach (array('enabled', 'inverse', 'cat_filter') as $b) { foreach (array('enabled', 'match_any_rule') as $b) {
$line[$b] = sql_bool_to_bool($line[$b]); $line[$b] = sql_bool_to_bool($line[$b]);
} }
@ -189,6 +189,8 @@ class Opml extends Handler_Protected {
$tmp_line["feed"] = ""; $tmp_line["feed"] = "";
} }
$tmp_line["cat_filter"] = sql_bool_to_bool($tmp_line["cat_filter"]);
unset($tmp_line["feed_id"]); unset($tmp_line["feed_id"]);
unset($tmp_line["cat_id"]); unset($tmp_line["cat_id"]);

2
include/functions.php
View File

@ -2048,7 +2048,7 @@
function getFeedTitle($link, $id, $cat = false) { function getFeedTitle($link, $id, $cat = false) {
if ($cat) { if ($cat) {
return getFeedCatTitle($link, $id); return getCategoryTitle($link, $id);
} else if ($id == -1) { } else if ($id == -1) {
return __("Starred articles"); return __("Starred articles");
} else if ($id == -2) { } else if ($id == -2) {