From 2dcb6a7d3b7f3be600ed0aa939b7b88f1b670345 Mon Sep 17 00:00:00 2001
From: atisne <aurelien.tisne@csgroup.eu>
Date: Fri, 17 Mar 2023 17:54:48 +0100
Subject: [PATCH] Update config cascade to inherit protected settings from the
 farmer

Useful to freeze some global choices, like authentication method, security
choices, ...
It's still possible to overwrite protected settings in the animal.
---
 DokuWikiFarmCore.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/DokuWikiFarmCore.php b/DokuWikiFarmCore.php
index bbf86e1..70d6645 100644
--- a/DokuWikiFarmCore.php
+++ b/DokuWikiFarmCore.php
@@ -313,6 +313,7 @@ protected function adjustCascade() {
             $append = array();
             $prepend = array();
             if($key == 'main') {
+                $prepend = array('protected' => array(DOKU_INC . 'conf/local.protected.php'));
                 $append = array(
                     'default' => array(DOKU_INC . 'conf/local.php'),
                     'protected' => array(DOKU_INC . 'lib/plugins/farmer/includes/config.php')
@@ -337,6 +338,7 @@ protected function adjustCascade() {
             } elseif($key == 'users') {
                 $config_cascade['plainauth.users']['protected'] = DOKU_INC . 'conf/users.auth.php';
             } elseif($key == 'plugins') {
+                $prepend = array('protected' => array(DOKU_INC . 'conf/plugins.protected.php'));
                 $append = array('default' => array(DOKU_INC . 'conf/plugins.local.php'));
             } else {
                 $append = array('default' => array(DOKU_INC . 'conf/' . $key . '.local.conf'));