From: Gergő Tisza <gtisza@wikimedia.org>
Date: Fri, 20 May 2016 14:27:56 +0000 (+0000)
Subject: registration: Ignore short variables in convertExtensionToRegistration
X-Git-Tag: 1.31.0-rc.0~6874
X-Git-Url: http://git.cyclocoop.org/%22.htmlspecialchars%28%24url_syndic%29.%22?a=commitdiff_plain;h=c68ae9d56127da6d11a7e52ec337b0924195f6e9;p=lhc%2Fweb%2Fwiklou.git

registration: Ignore short variables in convertExtensionToRegistration

substr returns false when the string is shorter than the initial
position, which makes array_key_exists freak out.

Change-Id: I38c2dd3a1ae5d700d66ff590dda4be67e4dc5514
---

diff --git a/maintenance/convertExtensionToRegistration.php b/maintenance/convertExtensionToRegistration.php
index f9dd58c299..aab20879d4 100644
--- a/maintenance/convertExtensionToRegistration.php
+++ b/maintenance/convertExtensionToRegistration.php
@@ -94,6 +94,9 @@ class ConvertExtensionToRegistration extends Maintenance {
 		$globalSettings = $this->getAllGlobals();
 		foreach ( $vars as $name => $value ) {
 			$realName = substr( $name, 2 ); // Strip 'wg'
+			if ( $realName === false ) {
+				continue;
+			}
 
 			// If it's an empty array that we likely set, skip it
 			if ( is_array( $value ) && count( $value ) === 0 && in_array( $realName, $__settings ) ) {