Merge branch 'rel-10_1' into rel-11_0

RotherOSS · Sep 30, 2024 · a381e59 · a381e59
2 parents fa688f1 + ad7a171
commit a381e59
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Kernel/System/SysConfig.pm b/Kernel/System/SysConfig.pm
@@ -5901,6 +5901,11 @@ sub _GetSettingsToDeploy {
         KEY:
         for my $Key ( sort keys %SettingsLookup ) {
             next KEY if !$ModifiedSettingsLookup{$Key};
+            # In case of "NotDirty" the modified settings are received as the last modified versions
+            # which contain also settings which were "reset to default", even if the default changed
+            # in the meantime. Thus their effective value might be outdated, and we will not overwrite
+            # the default effective value
+            next KEY if $ModifiedSettingsLookup{$Key}{ResetToDefault};
 
             # In case of "NotDirty" the modified settings are received as the last modified versions
             # which contain also settings which were "reset to default", even if the default changed