Merge "Restore Signupstart and Signupend messages for account creation"

diff --combined includes/templates/Usercreate.php
index 2f569d9,fcd492c..12210d0
--- 1/includes/templates/Usercreate.php
--- 2/includes/templates/Usercreate.php
+++ b/includes/templates/Usercreate.php
@@@ -46,6 -46,9 +46,9 @@@ class UsercreateTemplate extends BaseTe
                <div id="languagelinks">
                        <p><?php $this->html( 'languages' ); ?></p>
                </div>
+       <?php }
+             if ( !wfMessage( 'signupstart' )->isDisabled() ) { ?>
+               <div id="signupstart"><?php $this->msgWiki( 'signupstart' ); ?></div>
        <?php } ?>
        <div id="userloginForm">
                <h2 class="createaccount-join">
@@@ -113,16 -116,17 +116,16 @@@
  
                        <?php
                        if ( $this->data['usedomain'] ) {
 -                              $doms = "";
 +                              $select = new XmlSelect( 'wpDomain', false, $this->data['domain'] );
 +                              $select->setAttribute( 'tabindex', 4 );
                                foreach ( $this->data['domainnames'] as $dom ) {
 -                                      $doms .= "<option>" . htmlspecialchars( $dom ) . "</option>";
 +                                      $select->addOption( $dom );
                                }
                        ?>
                                <div id="mw-user-domain-section">
                                        <label for="wpDomain"><?php $this->msg( 'yourdomainname' ); ?></label>
                                        <div class="mw-input">
 -                                              <select name="wpDomain" value="<?php $this->text( 'domain' ); ?>" tabindex="4">
 -                                                      <?php echo $doms ?>
 -                                              </select>
 +                                              <?php echo $select->getHTML(); ?>
                                        </div>
                                </div>
                        <?php } ?>
@@@ -261,6 -265,9 +264,9 @@@
                        <?php if ( $this->haveData( 'uselang' ) ) { ?><input type="hidden" name="uselang" value="<?php $this->text( 'uselang' ); ?>" /><?php } ?>
                        <?php if ( $this->haveData( 'token' ) ) { ?><input type="hidden" name="wpCreateaccountToken" value="<?php $this->text( 'token' ); ?>" /><?php } ?>
                </form>
+               <?php if ( !wfMessage( 'signupend' )->isDisabled() ) { ?>
+                       <div id="signupend"><?php $this->html( 'signupend' ); ?></div>
+               <?php } ?>
        </div>
        <div class="mw-createacct-benefits-container">
                <h2><?php $this->msg( 'createacct-benefit-heading' ); ?></h2>