Merge "Call method with the same name it's defined with"

diff --combined includes/specials/SpecialUserlogin.php
index 704ccec,75b4a92..9764c9f
--- 1/includes/specials/SpecialUserlogin.php
--- 2/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@@ -219,7 -219,7 +219,7 @@@ class LoginForm extends SpecialPage 
                        return;
                }
  
-               $status = $this->addNewaccountInternal();
+               $status = $this->addNewAccountInternal();
                if ( !$status->isGood() ) {
                        $error = $status->getMessage();
                        $this->mainLoginForm( $error->toString() );
@@@ -865,7 -865,7 +865,7 @@@
         * @return Status object
         */
        function mailPasswordInternal( $u, $throttle = true, $emailTitle = 'passwordremindertitle', $emailText = 'passwordremindertext' ) {
 -              global $wgCanonicalServer, $wgScript, $wgNewPasswordExpiry;
 +              global $wgNewPasswordExpiry;
  
                if ( $u->getEmail() == '' ) {
                        return Status::newFatal( 'noemail', $u->getName() );
@@@ -882,11 -882,7 +882,11 @@@
                $u->setNewpassword( $np, $throttle );
                $u->saveSettings();
                $userLanguage = $u->getOption( 'language' );
 -              $m = $this->msg( $emailText, $ip, $u->getName(), $np, '<' . $wgCanonicalServer . $wgScript . '>',
 +
 +              $mainPage = Title::newMainPage();
 +              $mainPageUrl = $mainPage->getCanonicalURL();
 +
 +              $m = $this->msg( $emailText, $ip, $u->getName(), $np, '<' . $mainPageUrl . '>',
                        round( $wgNewPasswordExpiry / 86400 ) )->inLanguage( $userLanguage )->text();
                $result = $u->sendMail( $this->msg( $emailTitle )->inLanguage( $userLanguage )->text(), $m );