From 453576a56f85b0d490983a2abbfc679b88a3081f Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 13 Apr 2020 18:33:35 +0300 Subject: [PATCH] refactor(core): fix all flextype settings --- src/flextype/core/Plugins/Plugins.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/flextype/core/Plugins/Plugins.php b/src/flextype/core/Plugins/Plugins.php index caab7ebd..758ca11c 100755 --- a/src/flextype/core/Plugins/Plugins.php +++ b/src/flextype/core/Plugins/Plugins.php @@ -105,8 +105,9 @@ class Plugins // Go through... foreach ($plugins_list as $plugin) { + // Set plugin settings directory - $site_plugin_settings_dir = PATH['config'] . '/site/plugins/' . $plugin['dirname']; + $site_plugin_settings_dir = PATH['site'] . '/config/plugins/' . $plugin['dirname']; // Set default plugin settings and manifest files $default_plugin_settings_file = PATH['site'] . '/plugins/' . $plugin['dirname'] . '/settings.yaml'; @@ -132,6 +133,7 @@ class Plugins // Get site plugin settings content $site_plugin_settings_file_content = Filesystem::read($site_plugin_settings_file); + if (trim($site_plugin_settings_file_content) === '') { $site_plugin_settings = []; } else {