X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FconvertExtensionToRegistration.php;h=0554949500cc0aa11d3c7ee74dd756f4ccfe2dee;hb=47156d530e4132f8da112568c5f46ddccd9bdde5;hp=e83d7c63ac8a4b0634046aaa561e0b2aa379dc1e;hpb=dae0ebbe663b0dda2ddd04d69e552582a2fb2ff5;p=lhc%2Fweb%2Fwiklou.git

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() {