Force sections in INI file output to be ordered by when sections appear in file chain.

1 files changed, 27 insertions, 1 deletions

diff --git a/core/Config/IniFileChain.php b/core/Config/IniFileChain.php
index 9eaae3e9ff..6497bf2b0c 100644
--- a/core/Config/IniFileChain.php
+++ b/core/Config/IniFileChain.php
@@ -159,7 +159,20 @@ class IniFileChain
         }
 
         if ($dirty) {
-            @uksort($configToWrite, "strnatcasecmp");
+            // sort config sections by how early they appear in the file chain
+            $self = $this;
+            uksort($configToWrite, function ($sectionNameLhs, $sectionNameRhs) use ($self) {
+                $lhsIndex = $self->findIndexOfFirstFileWithSection($sectionNameLhs);
+                $rhsIndex = $self->findIndexOfFirstFileWithSection($sectionNameRhs);
+
+                if ($lhsIndex == $rhsIndex) {
+                    return 0;
+                } else if ($lhsIndex < $rhsIndex) {
+                    return -1;
+                } else {
+                    return 1;
+                }
+            });
 
             $writer = new IniWriter();
             return $writer->writeToString($configToWrite, $header);
@@ -340,4 +353,17 @@ class IniFileChain
         }
         return $merged;
     }
+
+    public function findIndexOfFirstFileWithSection($sectionName)
+    {
+        $count = 0;
+        foreach ($this->settingsChain as $file => $settings) {
+            if (isset($settings[$sectionName])) {
+                break;
+            }
+
+            ++$count;
+        }
+        return $count;
+    }
 }
\ No newline at end of file