diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2024-11-19 16:46:48 +0000 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2024-11-19 16:46:48 +0000 |
| commit | 4bdd926a1c6238fe49cc3a8b26e7ce1539ebb764 (patch) | |
| tree | 19deb331e4204003b11b88cc2f1e98cc2440b402 /classes/RSSUtils.php | |
| parent | 394d606fe977a331f733c62e5509469c2eb3ef31 (diff) | |
| parent | 154abc61a0f81bee7757fc57e594f3f4bccc0fdf (diff) | |
Merge branch 'feature/replace-get_pref-and-set_pref' into 'master'
Eliminate use of deprecated 'get_pref()' and 'set_pref()'.
See merge request tt-rss/tt-rss!75
Diffstat (limited to 'classes/RSSUtils.php')
| -rw-r--r-- | classes/RSSUtils.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/classes/RSSUtils.php b/classes/RSSUtils.php index cfd0b3b61..281e85bff 100644 --- a/classes/RSSUtils.php +++ b/classes/RSSUtils.php @@ -321,7 +321,7 @@ class RSSUtils { if ($feed) { $pluginhost = new PluginHost(); - $user_plugins = get_pref(Prefs::_ENABLED_PLUGINS, $feed->owner_uid); + $user_plugins = Prefs::get(Prefs::_ENABLED_PLUGINS, $feed->owner_uid); $pluginhost->load(Config::get(Config::PLUGINS), PluginHost::KIND_ALL); $pluginhost->load((string)$user_plugins, PluginHost::KIND_USER, $feed->owner_uid); @@ -403,7 +403,7 @@ class RSSUtils { $feed_language = mb_strtolower($feed_obj->feed_language); - if (!$feed_language) $feed_language = mb_strtolower(get_pref(Prefs::DEFAULT_SEARCH_LANGUAGE, $feed_obj->owner_uid)); + if (!$feed_language) $feed_language = mb_strtolower(Prefs::get(Prefs::DEFAULT_SEARCH_LANGUAGE, $feed_obj->owner_uid)); if (!$feed_language) $feed_language = 'simple'; $user = ORM::for_table('ttrss_users')->find_one($feed_obj->owner_uid); @@ -436,7 +436,7 @@ class RSSUtils { $cache_filename = sha1($feed_obj->feed_url) . ".xml"; $pluginhost = new PluginHost(); - $user_plugins = get_pref(Prefs::_ENABLED_PLUGINS, $feed_obj->owner_uid); + $user_plugins = Prefs::get(Prefs::_ENABLED_PLUGINS, $feed_obj->owner_uid); $pluginhost->load(Config::get(Config::PLUGINS), PluginHost::KIND_ALL); $pluginhost->load((string)$user_plugins, PluginHost::KIND_USER, $feed_obj->owner_uid); @@ -1274,7 +1274,7 @@ class RSSUtils { $entry_tags = FeedItem_Common::normalize_categories( array_diff($entry_tags, FeedItem_Common::normalize_categories(explode(",", - get_pref(Prefs::BLACKLISTED_TAGS, $feed_obj->owner_uid))))); + Prefs::get(Prefs::BLACKLISTED_TAGS, $feed_obj->owner_uid))))); Debug::log("resulting article tags: " . implode(", ", $entry_tags), Debug::LOG_VERBOSE); |