From 36e205b1fc97808dffc06e4d0719747f2bc97fcf Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Mon, 30 Mar 2015 17:39:36 -0700 Subject: [PATCH] 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 --- includes/registration/ExtensionRegistry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/registration/ExtensionRegistry.php b/includes/registration/ExtensionRegistry.php index 52e860c32a..c06f7e396c 100644 --- 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 ) { -- 2.20.1