Merge "Clean-up to global overrides in NewParserTest"

[lhc/web/wiklou.git] / includes / templates / UserloginVForm.php

diff --git a/includes/templates/UserloginVForm.php b/includes/templates/UserloginVForm.php
index a944c0a..0e688a4 100644 (file)
--- a/includes/templates/UserloginVForm.php
+++ b/includes/templates/UserloginVForm.php
@@ -31,8 +31,6 @@ class UserloginTemplateVForm extends BaseTemplate {
 ?>
 <div class="mw-ui-container">
        <?php
-       // Some extensions including CAPTCHAs add content to header on UserLoginForm hook.
-       $this->html( 'header' );
        if ( $this->haveData( 'languages' ) ) {
        ?>
                <div id="languagelinks">
@@ -43,6 +41,9 @@ class UserloginTemplateVForm extends BaseTemplate {
        ?>
 <div id="userloginForm">
 <form name="userlogin" class="mw-ui-vform" method="post" action="<?php $this->text( 'action' ); ?>">
+       <section class="mw-form-header">
+               <?php $this->html( 'header' ); /* extensions such as ConfirmEdit add form HTML here */ ?>
+       </section>
        <?php
 
        if ( $this->data['message'] ) {
@@ -51,7 +52,7 @@ class UserloginTemplateVForm extends BaseTemplate {
                <?php
                if ( $this->data['messagetype'] == 'error' ) {
                ?>
-                       <strong><?php $this->msg( 'loginerror' )?></strong><br />
+                       <strong><?php $this->msg( 'loginerror' ) ?></strong><br />
                <?php
                }
                $this->html( 'message' );