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

force _ENABLED_PLUGINS to string when passed to pluginhost

This commit is contained in:
Andrew Dolgov 2021-02-12 17:20:37 +03:00
parent 1f2ba932b8
commit 71dfc83466
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/handler/public.php
View File

@ -44,7 +44,7 @@ class Handler_Public extends Handler {
$tmppluginhost = new PluginHost(); $tmppluginhost = new PluginHost();
$tmppluginhost->load(PLUGINS, PluginHost::KIND_ALL); $tmppluginhost->load(PLUGINS, PluginHost::KIND_ALL);
$tmppluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid); $tmppluginhost->load((string)$user_plugins, PluginHost::KIND_USER, $owner_uid);
//$tmppluginhost->load_data(); //$tmppluginhost->load_data();
$handler = $tmppluginhost->get_feed_handler( $handler = $tmppluginhost->get_feed_handler(

4
classes/rssutils.php
View File

@ -276,7 +276,7 @@ class RSSUtils {
$user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid); $user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
$pluginhost->load(PLUGINS, PluginHost::KIND_ALL); $pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
$pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid); $pluginhost->load((string)$user_plugins, PluginHost::KIND_USER, $owner_uid);
//$pluginhost->load_data(); //$pluginhost->load_data();
$basic_info = []; $basic_info = [];
@ -401,7 +401,7 @@ class RSSUtils {
$user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid); $user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
$pluginhost->load(PLUGINS, PluginHost::KIND_ALL); $pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
$pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid); $pluginhost->load((string)$user_plugins, PluginHost::KIND_USER, $owner_uid);
//$pluginhost->load_data(); //$pluginhost->load_data();
$rss_hash = false; $rss_hash = false;

2
classes/userhelper.php
View File

@ -77,7 +77,7 @@ class UserHelper {
if ($owner_uid && SCHEMA_VERSION >= 100 && empty($_SESSION["safe_mode"])) { if ($owner_uid && SCHEMA_VERSION >= 100 && empty($_SESSION["safe_mode"])) {
$plugins = get_pref("_ENABLED_PLUGINS", $owner_uid); $plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
$pluginhost->load($plugins, PluginHost::KIND_USER, $owner_uid); $pluginhost->load((string)$plugins, PluginHost::KIND_USER, $owner_uid);
/*if (get_schema_version() > 100) { /*if (get_schema_version() > 100) {
$pluginhost->load_data(); $pluginhost->load_data();