From: Gergő Tisza <gtisza@wikimedia.org>
Date: Fri, 10 Jun 2016 00:43:49 +0000 (+0000)
Subject: Fix "Undefined index: type" warning on LoginSignupSpecialPage
X-Git-Tag: 1.31.0-rc.0~6653^2
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=4d226cbeb914f01d37a28b0ff78b60fef1cd653e;p=lhc%2Fweb%2Fwiklou.git

Fix "Undefined index: type" warning on LoginSignupSpecialPage

When discarding form descriptors that do not have an equivalent
AuthenticationRequest field, do not assume the descriptor always
has a type.

Th warning was probably caused by I2a8cd4850.

Change-Id: Id1daee1e4954199fcb2077178e8f08d1ad3ae916
---

diff --git a/includes/specialpage/LoginSignupSpecialPage.php b/includes/specialpage/LoginSignupSpecialPage.php
index d8f5e6697d..3099a9b0bb 100644
--- a/includes/specialpage/LoginSignupSpecialPage.php
+++ b/includes/specialpage/LoginSignupSpecialPage.php
@@ -854,7 +854,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 					!isset( $coreField['baseField'] )
 					|| !isset( $fieldInfo[$coreField['baseField']] )
 				) && !in_array( $fieldName, $specialFields, true )
-				&& $coreField['type'] !== 'submit'
+				&& ( !isset( $coreField['type'] ) || $coreField['type'] !== 'submit' )
 			) {
 				$coreFieldDescriptors[$fieldName] = null;
 				continue;