From: Andrew Garrett <werdna@users.mediawiki.org>
Date: Mon, 18 Jul 2011 22:02:11 +0000 (+0000)
Subject: Fix autoblocks in r92480 r92482 -- modified the wrong half
X-Git-Tag: 1.31.0-rc.0~28759
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=4b12070e70993978117815779dca61e41de80f6d;p=lhc%2Fweb%2Fwiklou.git

Fix autoblocks in r92480 r92482 -- modified the wrong half
---

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