Merge "Reapplying r45820 to support the NewSignupPage extension."

diff --combined includes/templates/Usercreate.php
index aba0d27,1f91fee..d1aef1d
--- 1/includes/templates/Usercreate.php
--- 2/includes/templates/Usercreate.php
+++ b/includes/templates/Usercreate.php
@@@ -58,23 -58,15 +58,23 @@@ class UsercreateTemplate extends BaseTe
                        <section class="mw-form-header">
                                <?php $this->html( 'header' ); /* extensions such as ConfirmEdit add form HTML here */ ?>
                        </section>
 +                      <!-- This element is used by the mediawiki.special.userlogin.signup.js module. -->
 +                      <div
 +                              id="mw-createacct-status-area"
 +                              <?php if ( $this->data['message'] ) { ?>
 +                                      class="<?php echo $this->data['messagetype']; ?>box"
 +                              <?php } else { ?>
 +                                      style="display: none;"
 +                              <?php } ?>
 +                      >
                        <?php if ( $this->data['message'] ) { ?>
 -                              <div class="<?php $this->text( 'messagetype' ); ?>box">
                                        <?php if ( $this->data['messagetype'] == 'error' ) { ?>
                                                <strong><?php $this->msg( 'createacct-error' ); ?></strong>
                                                <br />
                                        <?php } ?>
                                        <?php $this->html( 'message' ); ?>
 -                              </div>
                        <?php } ?>
 +                      </div>
  
                        <div>
                                <label for='wpName2'>
@@@ -220,7 -212,7 +220,7 @@@
                                                                                echo 'checked="checked"';
                                                                        } ?>
                                                                >
-                                                               <?php $this->msg( $inputItem['msg'] ); ?>
+                                                               <?php $this->msgHtml( $inputItem['msg'] ); ?>
                                                        </label>
                                                <?php
                                                } else {