Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2026-02-03 11:56:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Settings: Fix variable overlapping if same var name as in core

Browse Source 
Example: Plugin has setting key named "env". The same key exist in core. It would falsely get value from core, instead of the plugin
This commit is contained in:
slawkens
2026-01-30 16:41:31 +01:00
parent 5e4806f891
commit c2415e9df3
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
system/src/Settings.php
View File

@@ -122,18 +122,21 @@ class Settings implements \ArrayAccess
public static function display($plugin, $settings): array public static function display($plugin, $settings): array
{ {
$settingsDb = ModelsSettings::where('name', $plugin)->pluck('value', 'key')->toArray(); $settingsDb = ModelsSettings::where('name', $plugin)->pluck('value', 'key')->toArray();
$config = [];
require BASE . 'config.local.php';
foreach ($config as $key => $value) { if ($plugin === 'core') {
if (is_bool($value)) { $config = [];
$settingsDb[$key] = $value ? 'true' : 'false'; require BASE . 'config.local.php';
}
elseif (is_array($value)) { foreach ($config as $key => $value) {
$settingsDb[$key] = $value; if (is_bool($value)) {
} $settingsDb[$key] = $value ? 'true' : 'false';
else { }
$settingsDb[$key] = (string)$value; elseif (is_array($value)) {
$settingsDb[$key] = $value;
}
else {
$settingsDb[$key] = (string)$value;
}
} }
} }