} else if ( isset( $_COOKIE["{$wgCookiePrefix}Token"] ) ) {
$passwordCorrect = $this->mToken == $_COOKIE["{$wgCookiePrefix}Token"];
$from = 'cookie';
-
- if ( ( $sName == $this->mName ) && $passwordCorrect ) {
- # New session from old cookie - spread any applicable autoblocks
- $this->spreadBlock();
- }
} else {
# No session or persistent login cookie
$this->loadDefaults();
$this->mBlockedby = $this->mBlock->mBy;
$this->mBlockreason = $this->mBlock->mReason;
$this->mHideName = $this->mBlock->mHideName;
+ if ( $this->isLoggedIn() ) {
+ $this->spreadBlock();
+ }
} else {
$this->mBlock = null;
wfDebug( __METHOD__.": No block.\n" );
} else {
$cookies['Token'] = false;
}
-
- # Spread any applicable autoblocks
- $this->spreadBlock();
wfRunHooks( 'UserSetCookies', array( $this, &$session, &$cookies ) );
$_SESSION = $session + $_SESSION;