Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Fix accessing non-existing nested properties in setting controller [MAILPOET-1483]

Browse Source
This commit is contained in:
wxa
2019-03-28 19:32:57 +03:00
committed by M. Shull
parent 4c4ff0cba6
commit 604eedf91b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Settings/SettingsController.php
View File

@ -28,7 +28,7 @@ class SettingsController {
$default = $this->getDefaultValue($key_parts); $default = $this->getDefaultValue($key_parts);
} }
foreach ($key_parts as $key_part) { foreach ($key_parts as $key_part) {
if (array_key_exists($key_part, $setting)) { if (is_array($setting) && array_key_exists($key_part, $setting)) {
$setting = $setting[$key_part]; $setting = $setting[$key_part];
} else { } else {
return $default; return $default;
@ -120,7 +120,7 @@ class SettingsController {
private function getDefaultValue($keys) { private function getDefaultValue($keys) {
$default = $this->getAllDefaults(); $default = $this->getAllDefaults();
foreach ($keys as $key) { foreach ($keys as $key) {
if (array_key_exists($key, $default)) { if (is_array($default) && array_key_exists($key, $default)) {
$default = $default[$key]; $default = $default[$key];
} else { } else {
return null; return null;