From: Happy-melon <happy-melon@users.mediawiki.org>
Date: Sun, 26 Jun 2011 23:10:57 +0000 (+0000)
Subject: Follow-up r84588 CR
X-Git-Tag: 1.31.0-rc.0~29255
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=89b9bc984db5dbec32de43b24f4f05fc1e84be6c;p=lhc%2Fweb%2Fwiklou.git

Follow-up r84588 CR
---

diff --git a/includes/Block.php b/includes/Block.php
index 7911163c5d..0b52d85ea8 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -625,7 +625,7 @@ class Block {
 		$autoblock->prevents( 'editownusertalk', $this->prevents( 'editownusertalk' ) );
 
 		$dbr = wfGetDB( DB_SLAVE );
-		if ( $this->mTimestamp == $dbr->getInfinity() ) {
+		if ( $this->mExpiry == $dbr->getInfinity() ) {
 			# Original block was indefinite, start an autoblock now
 			$autoblock->mExpiry = Block::getAutoblockExpiry( $timestamp );
 		} else {