From e378104867d8710af1a0afb404ff3bdcd6ea9135 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 27 Feb 2020 12:14:56 +0100
Subject: [baseconfig] Allow disabling override for shadowed fields

---
 modules-available/baseconfig/page.inc.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules-available/baseconfig/page.inc.php b/modules-available/baseconfig/page.inc.php
index 498fd166..1566464b 100644
--- a/modules-available/baseconfig/page.inc.php
+++ b/modules-available/baseconfig/page.inc.php
@@ -54,8 +54,7 @@ class Page_BaseConfig extends Page
 			BaseConfigUtil::markShadowedVars($vars, $newValues);
 			// Validate input
 			foreach ($vars as $key => $var) {
-				if (isset($var['shadowed']))
-					continue;
+				// Delete entries where we disabled override
 				if ($this->targetModule !== false) {
 					// Module mode
 					if (is_array($override) && (!isset($override[$key]) || $override[$key] !== 'on')) {
@@ -65,6 +64,9 @@ class Page_BaseConfig extends Page
 						continue;
 					}
 				}
+				// Only after that, check if variable is shadowed (disabled)
+				if (isset($var['shadowed']))
+					continue;
 				$validator = $var['validator'];
 				$displayValue = (isset($newValues[$key]) ? $newValues[$key] : '');
 				// Validate data first!
-- 
cgit v1.2.3-55-g7522