X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecialpage%2FLoginSignupSpecialPage.php;h=133729ae76df6162bbd347e513ffa3e4e26be1c2;hb=50c3fdc2db6346b1025e7549bd9792e2ef2a0e22;hp=8dff1632b52699b875d65a4ec136adfc41fa3a2f;hpb=54bd9691c5465a78ff3ee05498b65184c132079e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specialpage/LoginSignupSpecialPage.php b/includes/specialpage/LoginSignupSpecialPage.php
index 8dff1632b5..133729ae76 100644
--- a/includes/specialpage/LoginSignupSpecialPage.php
+++ b/includes/specialpage/LoginSignupSpecialPage.php
@@ -620,7 +620,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 		// add pre/post text
 		// header used by ConfirmEdit, CondfirmAccount, Persona, WikimediaIncubator, SemanticSignup
 		// should be above the error message but HTMLForm doesn't support that
-		$form->addHeaderText( $fakeTemplate->html( 'header' ) );
+		$form->addHeaderText( $fakeTemplate->get( 'header' ) );
 
 		// FIXME the old form used this for error/warning messages which does not play well with
 		// HTMLForm (maybe it could with a subclass?); for now only display it for signups
@@ -633,7 +633,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 		}
 
 		// header used by MobileFrontend
-		$form->addHeaderText( $fakeTemplate->html( 'formheader' ) );
+		$form->addHeaderText( $fakeTemplate->get( 'formheader' ) );
 
 		// blank signup footer for site customization
 		if ( $this->isSignup() && $this->showExtraInformation() ) {
@@ -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;
@@ -1050,6 +1050,11 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 					], $this->msg( 'userlogin-helplink2' )->text() ),
 					'weight' => 200,
 				],
+				// button for ResetPasswordSecondaryAuthenticationProvider
+				'skipReset' => [
+					'weight' => 110,
+					'flags' => [],
+				],
 			];
 		}
 		$fieldDefinitions['username'] += [