Merge "Fix "Undefined index: type" warning on LoginSignupSpecialPage"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 10 Jun 2016 01:29:04 +0000 (01:29 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 10 Jun 2016 01:29:04 +0000 (01:29 +0000)
includes/specialpage/LoginSignupSpecialPage.php

index d8f5e66..3099a9b 100644 (file)
@@ -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;