From 8b6e08a11a5f5c3b52b686e7bfc4b21993d94d2d Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 2 Sep 2012 13:15:57 +0400 Subject: opml export filter format fix --- classes/opml.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/opml.php b/classes/opml.php index 1940250d3..4cf9a71a4 100644 --- a/classes/opml.php +++ b/classes/opml.php @@ -165,7 +165,7 @@ class Opml extends Handler_Protected { WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY id"); 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]); } -- cgit v1.2.3 From 8add44ec95d4f6e230fd7c5fd1a8995b7e72dde6 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 2 Sep 2012 13:33:55 +0400 Subject: opml: fix category title in filter export --- include/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/functions.php b/include/functions.php index 960cf996f..1ee334fa9 100644 --- a/include/functions.php +++ b/include/functions.php @@ -2048,7 +2048,7 @@ function getFeedTitle($link, $id, $cat = false) { if ($cat) { - return getFeedCatTitle($link, $id); + return getCategoryTitle($link, $id); } else if ($id == -1) { return __("Starred articles"); } else if ($id == -2) { -- cgit v1.2.3 From 8592a8e3b2515499450568e2a7ab9a347ca7d535 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 2 Sep 2012 13:38:03 +0400 Subject: opml: fix cat_filter type --- classes/opml.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/classes/opml.php b/classes/opml.php index 4cf9a71a4..815ae883b 100644 --- a/classes/opml.php +++ b/classes/opml.php @@ -189,6 +189,8 @@ class Opml extends Handler_Protected { $tmp_line["feed"] = ""; } + $tmp_line["cat_filter"] = sql_bool_to_bool($tmp_line["cat_filter"]); + unset($tmp_line["feed_id"]); unset($tmp_line["cat_id"]); -- cgit v1.2.3