Merge pull request #80 from atisne/feat-inherit_protected

Update config cascade to inherit protected settings from the farmer
cosmocode · Apr 16, 2024 · 19577c9 · 19577c9
2 parents 54704e3 + 4b1aad0
commit 19577c9
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/DokuWikiFarmCore.php b/DokuWikiFarmCore.php
@@ -337,6 +337,9 @@ protected function adjustCascade()
             $append = [];
             $prepend = [];
             if ($key == 'main') {
+                $prepend = [
+                     'protected' => [DOKU_INC . 'conf/local.protected.php']
+                ];
                 $append = [
                     'default' => [DOKU_INC . 'conf/local.php'],
                     'protected' => [DOKU_INC . 'lib/plugins/farmer/includes/config.php']
@@ -375,6 +378,9 @@ protected function adjustCascade()
             } elseif ($key == 'users') {
                 $config_cascade['plainauth.users']['protected'] = DOKU_INC . 'conf/users.auth.php';
             } elseif ($key == 'plugins') {
+                $prepend = [
+                    'protected' => [DOKU_INC . 'conf/local.protected.php']
+                ];
                 $append = [
                     'default' => [DOKU_INC . 'conf/plugins.local.php']
                 ];