registration: Use array_merge() rather than array plus when merging

Because plus doesn't deal with numerical keys well. We do need old values
to win, because LocalSettings.php runs before extension.json files.

Change-Id: I56318fe586776940f7e28ca038dad49d24f24f2e

diff --git a/includes/registration/ExtensionRegistry.php b/includes/registration/ExtensionRegistry.php
index 52e860c..c06f7e3 100644 (file)
--- a/includes/registration/ExtensionRegistry.php
+++ b/includes/registration/ExtensionRegistry.php
@@ -156,7 +156,7 @@ class ExtensionRegistry {
                                // Now merge groups that didn't exist yet
                                $GLOBALS[$key] += $val;
                        } elseif ( is_array( $GLOBALS[$key] ) && is_array( $val ) ) {
-                               $GLOBALS[$key] += $val;
+                               $GLOBALS[$key] = array_merge( $val, $GLOBALS[$key] );
                        } // else case is a config setting where it has already been overriden, so don't set it
                }
                foreach ( $info['defines'] as $name => $val ) {