Merge "Watch user page and user talk page by default"

diff --combined includes/specials/SpecialUserlogin.php
index e701e0f,008ad5d..3fc5ebb
--- 1/includes/specials/SpecialUserlogin.php
--- 2/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@@ -507,9 -507,12 +507,12 @@@ class LoginForm extends SpecialPage 
                $u->setOption( 'rememberpassword', $this->mRemember ? 1 : 0 );
                $u->saveSettings();
  
-               # Update user count
+               // Update user count
                DeferredUpdates::addUpdate( new SiteStatsUpdate( 0, 0, 0, 0, 1 ) );
  
+               // Watch user's userpage and talk page
+               $u->addWatch( $u->getUserPage(), WatchedItem::IGNORE_USER_RIGHTS );
+ 
                return Status::newGood( $u );
        }
  
@@@ -865,7 -868,7 +868,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 -885,7 +885,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 );
  
@@@ -1118,10 -1117,6 +1121,10 @@@
                                'mediawiki.special.userlogin'
                        ) );
  
 +                      $out->addModules( array(
 +                              'mediawiki.special.createaccount.js'
 +                      ) );
 +
                        $q = 'action=submitlogin&type=login';
                        $linkq = 'type=signup';
                }