From 12113ce79f87f1f11c0c6e1de7e8bdd14416b51d Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Mon, 8 Aug 2016 02:56:39 -0700 Subject: [PATCH] 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 --- maintenance/convertExtensionToRegistration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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() { -- 2.20.1