Revert "filters: support matching on multiple feeds/categories"

[tt-rss.git] / classes / opml.php

diff --git a/classes/opml.php b/classes/opml.php
index 7d6db707d7b8392d2e002a5bad980a5c2c4217ee..0671053c88aba83224f4b1054dd7d80c7669e26e 100644 (file)
--- a/classes/opml.php
+++ b/classes/opml.php
@@ -182,7 +182,7 @@ class Opml extends Handler_Protected {
                                        $cat_filter = sql_bool_to_bool($tmp_line["cat_filter"]);
 
                                        if ($cat_filter && $tmp_line["cat_id"] || $tmp_line["feed_id"]) {
-                                               $tmp_line["feed"] = getFeedTitle(
+                                               $tmp_line["feed"] = Feeds::getFeedTitle(
                                                        $cat_filter ? $tmp_line["cat_id"] : $tmp_line["feed_id"],
                                                        $cat_filter);
                                        } else {
@@ -292,9 +292,9 @@ class Opml extends Handler_Protected {
                        $fg_color = $this->dbh->escape_string($attrs->getNamedItem('label-fg-color')->nodeValue);
                        $bg_color = $this->dbh->escape_string($attrs->getNamedItem('label-bg-color')->nodeValue);
 
-                       if (!label_find_id($label_name, $_SESSION['uid'])) {
+                       if (!Labels::find_id($label_name, $_SESSION['uid'])) {
                                $this->opml_notice(T_sprintf("Adding label %s", htmlspecialchars($label_name)));
-                               label_create($label_name, $fg_color, $bg_color, $owner_uid);
+                               Labels::create($label_name, $fg_color, $bg_color, $owner_uid);
                        } else {
                                $this->opml_notice(T_sprintf("Duplicate label: %s", htmlspecialchars($label_name)));
                        }