Merge "Make it show email as required if you choose to email a random password."

diff --combined resources/Resources.php
index 43116e4,1fcc3ad..02cde52
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -100,8 -100,8 +100,8 @@@ return array
        ),
        'skins.vector.js' => array(
                'scripts' => array(
 -                      'vector/vector.js',
                        'vector/collapsibleTabs.js',
 +                      'vector/vector.js',
                ),
                'position' => 'top',
                'dependencies' => 'jquery.delayedBind',
@@@ -719,7 -719,6 +719,7 @@@
        'mediawiki.action.edit' => array(
                'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.js',
                'dependencies' => array(
 +                      'mediawiki.legacy.wikibits',
                        'jquery.textSelection',
                        'jquery.byteLimit',
                ),
@@@ -925,9 -924,7 +925,9 @@@
        ),
        'mediawiki.special.changeslist' => array(
                'styles' => 'resources/mediawiki.special/mediawiki.special.changeslist.css',
 -              'dependencies' => array( 'jquery.makeCollapsible', 'mediawiki.icon' ),
 +      ),
 +      'mediawiki.special.changeslist.enhanced' => array(
 +              'styles' => 'resources/mediawiki.special/mediawiki.special.changeslist.enhanced.css',
        ),
        'mediawiki.special.movePage' => array(
                'scripts' => 'resources/mediawiki.special/mediawiki.special.movePage.js',
@@@ -985,6 -982,7 +985,7 @@@
                'scripts' => 'resources/mediawiki.special/mediawiki.special.createAccount.js',
                'messages' => array(
                        'createacct-captcha',
+                       'createacct-emailrequired',
                        'createacct-imgcaptcha-ph'
                ),
                'dependencies' => 'mediawiki.jqueryMsg',