From: Kunal Mehta <legoktm@member.fsf.org>
Date: Mon, 8 Aug 2016 09:56:39 +0000 (-0700)
Subject: registration: Fix adding $formerGlobals in conversion script
X-Git-Tag: 1.31.0-rc.0~6106^2
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=12113ce79f87f1f11c0c6e1de7e8bdd14416b51d;p=lhc%2Fweb%2Fwiklou.git

registration: Fix adding $formerGlobals in conversion script

Using + for two arrays does not work if they are using numerical
indexes.

Bug: T142344
Change-Id: I49541bd344fa81d20c9b4cf61b968b58137ab140
---

diff --git a/maintenance/convertExtensionToRegistration.php b/maintenance/convertExtensionToRegistration.php
index e83d7c63ac..0554949500 100644
--- a/maintenance/convertExtensionToRegistration.php
+++ b/maintenance/convertExtensionToRegistration.php
@@ -66,7 +66,7 @@ class ConvertExtensionToRegistration extends Maintenance {
 		$processor = new ReflectionClass( 'ExtensionProcessor' );
 		$settings = $processor->getProperty( 'globalSettings' );
 		$settings->setAccessible( true );
-		return $settings->getValue() + $this->formerGlobals;
+		return array_merge( $settings->getValue(), $this->formerGlobals );
 	}
 
 	public function execute() {