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

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

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