Fix case where user preferences are not removed

MauricioFauth · MauricioFauth · commit daa9d1e252f9 · 2026-01-24T20:43:40.000-03:00
When an user revert a setting to its default value, the setting is not removed from the storage. Related to #19925 Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
diff --git a/libraries/classes/UserPreferences.php b/libraries/classes/UserPreferences.php
@@ -131,7 +131,7 @@ public function save(array $config_array)
             $existingPrefs = $this->load();
             if (isset($existingPrefs['config_data']['2fa'])) {
                 // This is likely a partial save from page settings - merge to preserve 2fa
-                $config_array = array_merge($existingPrefs['config_data'], $config_array);
+                $config_array['2fa'] = $existingPrefs['config_data']['2fa'];
             }
         }
 
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -48750,16 +48750,6 @@ parameters:
 			count: 1
 			path: test/classes/UserPreferencesTest.php
 
-		-
-			message: "#^Cannot access offset '2fa' on mixed\\.$#"
-			count: 1
-			path: test/classes/UserPreferencesTest.php
-
-		-
-			message: "#^Cannot access offset 'Console/Mode' on mixed\\.$#"
-			count: 1
-			path: test/classes/UserPreferencesTest.php
-
 		-
 			message: "#^Cannot access offset 'DisableIS' on mixed\\.$#"
 			count: 1
@@ -48790,21 +48780,11 @@ parameters:
 			count: 3
 			path: test/classes/UserPreferencesTest.php
 
-		-
-			message: "#^Cannot access offset 'secret' on mixed\\.$#"
-			count: 1
-			path: test/classes/UserPreferencesTest.php
-
 		-
 			message: "#^Cannot access offset 'server_2' on mixed\\.$#"
 			count: 1
 			path: test/classes/UserPreferencesTest.php
 
-		-
-			message: "#^Cannot access offset 'settings' on mixed\\.$#"
-			count: 1
-			path: test/classes/UserPreferencesTest.php
-
 		-
 			message: "#^Cannot access offset 'ts' on mixed\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -14186,9 +14186,10 @@
       <code>$allowList[$path]</code>
       <code>$excludeList[$path]</code>
     </MixedArrayTypeCoercion>
-    <MixedAssignment occurrences="5">
+    <MixedAssignment occurrences="6">
       <code>$configData</code>
       <code>$configData</code>
+      <code>$config_array['2fa']</code>
       <code>$prefs['config_data'][$path]</code>
       <code>$timestamp</code>
       <code>$value</code>
@@ -16451,17 +16452,12 @@
     </MixedMethodCall>
   </file>
   <file src="test/classes/UserPreferencesTest.php">
-    <InvalidArrayOffset occurrences="2">
-      <code>$resultConfig['2fa']</code>
-      <code>$resultConfig['Console/Mode']</code>
-    </InvalidArrayOffset>
     <MixedArgument occurrences="1">
       <code>$_SESSION['userconfig']</code>
     </MixedArgument>
-    <MixedArrayAccess occurrences="3">
+    <MixedArrayAccess occurrences="2">
       <code>$_SESSION['userconfig']['db']</code>
       <code>$_SESSION['userconfig']['ts']</code>
-      <code>$resultConfig['2fa']['settings']</code>
     </MixedArrayAccess>
     <TypeDoesNotContainType occurrences="1">
       <code>assertTrue</code>
diff --git a/test/classes/UserPreferencesTest.php b/test/classes/UserPreferencesTest.php
@@ -233,19 +233,30 @@ public function testSave(): void
 
         // Initial save with 2fa
         $initialConfig = [
+            'CharEditing' => 'textarea',
             '2fa' => ['backend' => 'application', 'settings' => ['secret' => 'thisisasecret']],
-            'theme' => 'dark',
+            'RowActionLinks' => 'both',
+            'TableNavigationLinksMode' => 'both',
         ];
         $this->userPreferences->save($initialConfig);
 
         // Partial save without 2fa
-        $partialConfig = ['Console/Mode' => 'collapse'];
+        $partialConfig = [
+            'CharEditing' => 'textarea',
+            'TableNavigationLinksMode' => 'text',
+            'Console/Mode' => 'collapse',
+        ];
         $this->userPreferences->save($partialConfig);
 
         // Check that 2fa is still present
         $resultConfig = $_SESSION['userconfig']['db'];
-        self::assertSame('thisisasecret', $resultConfig['2fa']['settings']['secret']);
-        self::assertSame('collapse', $resultConfig['Console/Mode']);
+        $expected = [
+            'CharEditing' => 'textarea',
+            'TableNavigationLinksMode' => 'text',
+            'Console/Mode' => 'collapse',
+            '2fa' => ['backend' => 'application', 'settings' => ['secret' => 'thisisasecret']],
+        ];
+        self::assertSame($expected, $resultConfig);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public function save(array $config_array)`
`131`	`131`	`$existingPrefs = $this->load();`
`132`	`132`	`if (isset($existingPrefs['config_data']['2fa'])) {`
`133`	`133`	`// This is likely a partial save from page settings - merge to preserve 2fa`
`134`		`- $config_array = array_merge($existingPrefs['config_data'], $config_array);`
	`134`	`+ $config_array['2fa'] = $existingPrefs['config_data']['2fa'];`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`