From cfa694ea73d128415ce5ebf446a8bb1f8799dcd1 Mon Sep 17 00:00:00 2001 From: michaelletzgus Date: Sun, 4 Feb 2018 15:59:23 +0100 Subject: Fix undefined index problem Nextcloud 13RC4, error in logfile, triggered by "occ config:list": Invalid argument supplied for foreach() at lib/private/AppConfig.php#297 PHP Undefined index: workflowengine at lib/private/AppConfig.php#297 Fix: Check if index exists in array before using it. --- lib/private/AppConfig.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/private/AppConfig.php b/lib/private/AppConfig.php index 59a340cb491..880bf647469 100644 --- a/lib/private/AppConfig.php +++ b/lib/private/AppConfig.php @@ -288,9 +288,11 @@ class AppConfig implements IAppConfig { public function getFilteredValues($app) { $values = $this->getValues($app, false); - foreach ($this->sensitiveValues[$app] as $sensitiveKey) { - if (isset($values[$sensitiveKey])) { - $values[$sensitiveKey] = IConfig::SENSITIVE_VALUE; + if (array_key_exists($app, $this->sensitiveValues)) { + foreach ($this->sensitiveValues[$app] as $sensitiveKey) { + if (isset($values[$sensitiveKey])) { + $values[$sensitiveKey] = IConfig::SENSITIVE_VALUE; + } } } -- cgit v1.2.3 From 05b8eb140cc1c1fa27520bb5c0762f08e144b6c0 Mon Sep 17 00:00:00 2001 From: michaelletzgus Date: Mon, 5 Feb 2018 10:50:32 +0100 Subject: using isset() using isset() instead of array_key_exists() --- lib/private/AppConfig.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/private/AppConfig.php b/lib/private/AppConfig.php index 880bf647469..6d24ca5fa8e 100644 --- a/lib/private/AppConfig.php +++ b/lib/private/AppConfig.php @@ -288,7 +288,7 @@ class AppConfig implements IAppConfig { public function getFilteredValues($app) { $values = $this->getValues($app, false); - if (array_key_exists($app, $this->sensitiveValues)) { + if (isset($this->sensitiveValues[$app])) { foreach ($this->sensitiveValues[$app] as $sensitiveKey) { if (isset($values[$sensitiveKey])) { $values[$sensitiveKey] = IConfig::SENSITIVE_VALUE; -- cgit v1.2.3