From f13d9a997bc2a5e5cd2e1b0da1b644c5cc609391 Mon Sep 17 00:00:00 2001 From: trendschau Date: Thu, 22 Feb 2024 15:52:17 +0100 Subject: [PATCH] v2.2.2 fix error for empty plugin folder --- .../Controllers/ControllerWebSystem.php | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/system/typemill/Controllers/ControllerWebSystem.php b/system/typemill/Controllers/ControllerWebSystem.php index 7ffd72e..03a630b 100644 --- a/system/typemill/Controllers/ControllerWebSystem.php +++ b/system/typemill/Controllers/ControllerWebSystem.php @@ -125,23 +125,28 @@ class ControllerWebSystem extends Controller $parser = $this->routeParser ); - $extension = new Extension(); - $pluginDefinitions = $extension->getPluginDetails($this->settings['plugins']); - # add userroles and other datasets - foreach($pluginDefinitions as $name => $definitions) + $pluginSettings = $this->settings['plugins'] ?? false; + $pluginDefinitions = []; + + if($pluginSettings) { - if(isset($definitions['forms']['fields'])) + $extension = new Extension(); + $pluginDefinitions = $extension->getPluginDetails($pluginSettings); + + # add userroles and other datasets + foreach($pluginDefinitions as $name => $definitions) { - $pluginDefinitions[$name]['forms']['fields'] = $this->addDatasets($definitions['forms']['fields']); + if(isset($definitions['forms']['fields'])) + { + $pluginDefinitions[$name]['forms']['fields'] = $this->addDatasets($definitions['forms']['fields']); + } } + } -# $pluginSettings = $extension->getPluginSettings($this->settings['plugins']); - $pluginSettings = $this->settings['plugins']; - $license = []; - if(is_array($this->settings['license'])) + if(isset($this->settings['license']) && is_array($this->settings['license'])) { $license = array_keys($this->settings['license']); }