http://www.mediawiki.org/wiki/Special:Code/MediaWiki/92482
Revision: 92482
Author: werdna
Date: 2011-07-18 21:56:59 +0000 (Mon, 18 Jul 2011)
Log Message:
-----------
Fix autoblocks in r92480
Modified Paths:
--------------
trunk/phase3/includes/Block.php
Modified: trunk/phase3/includes/Block.php
===================================================================
--- trunk/phase3/includes/Block.php 2011-07-18 21:56:10 UTC (rev 92481)
+++ trunk/phase3/includes/Block.php 2011-07-18 21:56:59 UTC (rev 92482)
@@ -643,8 +643,8 @@
$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 {
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
