Merge branch 'main' into develop

This commit is contained in:
slawkens
2026-01-30 16:43:48 +01:00

View File

@@ -122,6 +122,8 @@ 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();
if ($plugin === 'core') {
$config = []; $config = [];
require BASE . 'config.local.php'; require BASE . 'config.local.php';
@@ -136,6 +138,7 @@ class Settings implements \ArrayAccess
$settingsDb[$key] = (string)$value; $settingsDb[$key] = (string)$value;
} }
} }
}
$javascript = ''; $javascript = '';
ob_start(); ob_start();