mirror of
https://github.com/slawkens/myaac.git
synced 2025-10-14 01:34:55 +02:00
Fix if setting found in db, but not found in plugins
This commit is contained in:
@@ -472,24 +472,22 @@ class Settings implements \ArrayAccess
|
|||||||
if (!isset($this->settingsFile[$pluginKeyName]['settings'])) {
|
if (!isset($this->settingsFile[$pluginKeyName]['settings'])) {
|
||||||
throw new \RuntimeException('Unknown plugin settings: ' . $pluginKeyName);
|
throw new \RuntimeException('Unknown plugin settings: ' . $pluginKeyName);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->settingsFile[$pluginKeyName]['settings'];
|
return $this->settingsFile[$pluginKeyName]['settings'];
|
||||||
}
|
}
|
||||||
|
|
||||||
$ret = [];
|
if (!isset($this->settingsFile[$pluginKeyName]['settings'][$key])) {
|
||||||
if(isset($this->settingsFile[$pluginKeyName]['settings'][$key])) {
|
return null;
|
||||||
$ret = $this->settingsFile[$pluginKeyName]['settings'][$key];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$ret = $this->settingsFile[$pluginKeyName]['settings'][$key];
|
||||||
|
|
||||||
if(isset($this->settingsDatabase[$pluginKeyName][$key])) {
|
if(isset($this->settingsDatabase[$pluginKeyName][$key])) {
|
||||||
$value = $this->settingsDatabase[$pluginKeyName][$key];
|
$value = $this->settingsDatabase[$pluginKeyName][$key];
|
||||||
|
|
||||||
$ret['value'] = $value;
|
$ret['value'] = $value;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (!isset($this->settingsFile[$pluginKeyName]['settings'][$key])) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
$ret['value'] = $this->settingsFile[$pluginKeyName]['settings'][$key]['default'];
|
$ret['value'] = $this->settingsFile[$pluginKeyName]['settings'][$key]['default'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user