aboutsummaryrefslogtreecommitdiff
path: root/app/Controllers/extensionController.php
diff options
context:
space:
mode:
Diffstat (limited to 'app/Controllers/extensionController.php')
-rw-r--r--app/Controllers/extensionController.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index 0158b2f76..9cfc6ff68 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -54,7 +54,7 @@ class FreshRSS_extension_Controller extends FreshRSS_ActionController {
// fetch the list as an array
/** @var array<string,mixed> $list*/
$list = json_decode($json, true);
- if (empty($list)) {
+ if (empty($list) || !is_array($list)) {
Minz_Log::warning('Failed to convert extension file list');
return [];
}
@@ -136,9 +136,9 @@ class FreshRSS_extension_Controller extends FreshRSS_ActionController {
$conf = null;
if ($type === 'system') {
- $conf = FreshRSS_Context::$system_conf;
+ $conf = FreshRSS_Context::systemConf();
} elseif ($type === 'user') {
- $conf = FreshRSS_Context::$user_conf;
+ $conf = FreshRSS_Context::userConf();
}
$res = $ext->install();
@@ -198,9 +198,9 @@ class FreshRSS_extension_Controller extends FreshRSS_ActionController {
$conf = null;
if ($type === 'system') {
- $conf = FreshRSS_Context::$system_conf;
+ $conf = FreshRSS_Context::systemConf();
} elseif ($type === 'user') {
- $conf = FreshRSS_Context::$user_conf;
+ $conf = FreshRSS_Context::userConf();
}
$res = $ext->uninstall();