From: Andrew Garrett <werdna@users.mediawiki.org>
Date: Mon, 18 Jul 2011 21:56:59 +0000 (+0000)
Subject: Fix autoblocks in r92480
X-Git-Tag: 1.31.0-rc.0~28761
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=db9832ae98437dec5720ab0bedf93b512d569bcf;p=lhc%2Fweb%2Fwiklou.git

Fix autoblocks in r92480
---

diff --git a/includes/Block.php b/includes/Block.php
index c88ece71db..1e535d8c94 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -643,8 +643,8 @@ class Block {
 		$autoblock->mHideName = $this->mHideName;
 		$autoblock->prevents( 'editownusertalk', $this->prevents( 'editownusertalk' ) );
 
-		$dbr = wfGetDB( DB_SLAVE );
-		if ( $this->mExpiry == $dbr->getInfinity() ) {
+		 $dbr = wfGetDB( DB_SLAVE );
+		if ( $timestamp == 'infinity' ) {
 			# Original block was indefinite, start an autoblock now
 			$autoblock->mExpiry = Block::getAutoblockExpiry( $timestamp );
 		} else {