From: Fran Rogers <krimpet@users.mediawiki.org>
Date: Mon, 15 Sep 2008 05:04:16 +0000 (+0000)
Subject: Reverted r40771 for now - causes problems with CentralAuth
X-Git-Tag: 1.31.0-rc.0~45296
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=a4d2cca85c6899db2083e8df8e894ed5e8eacb05;p=lhc%2Fweb%2Fwiklou.git

Reverted r40771 for now - causes problems with CentralAuth
---

diff --git a/includes/User.php b/includes/User.php
index b7819e5c78..bc4b13192c 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -834,11 +834,6 @@ class User {
 		} 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();
@@ -1054,6 +1049,9 @@ class User {
 			$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" );
@@ -2238,9 +2236,6 @@ class User {
 		} else {
 			$cookies['Token'] = false;
 		}
-
-		# Spread any applicable autoblocks
-		$this->spreadBlock();
 		
 		wfRunHooks( 'UserSetCookies', array( $this, &$session, &$cookies ) );
 		$_SESSION = $session + $_SESSION;