| Index: trunk/phase3/includes/User.php |
| — | — | @@ -834,11 +834,6 @@ |
| 835 | 835 | } else if ( isset( $_COOKIE["{$wgCookiePrefix}Token"] ) ) { |
| 836 | 836 | $passwordCorrect = $this->mToken == $_COOKIE["{$wgCookiePrefix}Token"]; |
| 837 | 837 | $from = 'cookie'; |
| 838 | | - |
| 839 | | - if ( ( $sName == $this->mName ) && $passwordCorrect ) { |
| 840 | | - # New session from old cookie - spread any applicable autoblocks |
| 841 | | - $this->spreadBlock(); |
| 842 | | - } |
| 843 | 838 | } else { |
| 844 | 839 | # No session or persistent login cookie |
| 845 | 840 | $this->loadDefaults(); |
| — | — | @@ -1054,6 +1049,9 @@ |
| 1055 | 1050 | $this->mBlockedby = $this->mBlock->mBy; |
| 1056 | 1051 | $this->mBlockreason = $this->mBlock->mReason; |
| 1057 | 1052 | $this->mHideName = $this->mBlock->mHideName; |
| | 1053 | + if ( $this->isLoggedIn() ) { |
| | 1054 | + $this->spreadBlock(); |
| | 1055 | + } |
| 1058 | 1056 | } else { |
| 1059 | 1057 | $this->mBlock = null; |
| 1060 | 1058 | wfDebug( __METHOD__.": No block.\n" ); |
| — | — | @@ -2238,9 +2236,6 @@ |
| 2239 | 2237 | } else { |
| 2240 | 2238 | $cookies['Token'] = false; |
| 2241 | 2239 | } |
| 2242 | | - |
| 2243 | | - # Spread any applicable autoblocks |
| 2244 | | - $this->spreadBlock(); |
| 2245 | 2240 | |
| 2246 | 2241 | wfRunHooks( 'UserSetCookies', array( $this, &$session, &$cookies ) ); |
| 2247 | 2242 | $_SESSION = $session + $_SESSION; |