| Index: trunk/phase3/includes/Block.php |
| — | — | @@ -643,8 +643,8 @@ |
| 644 | 644 | $autoblock->mHideName = $this->mHideName; |
| 645 | 645 | $autoblock->prevents( 'editownusertalk', $this->prevents( 'editownusertalk' ) ); |
| 646 | 646 | |
| 647 | | - $dbr = wfGetDB( DB_SLAVE ); |
| 648 | | - if ( $this->mExpiry == $dbr->getInfinity() ) { |
| | 647 | + $dbr = wfGetDB( DB_SLAVE ); |
| | 648 | + if ( $timestamp == 'infinity' ) { |
| 649 | 649 | # Original block was indefinite, start an autoblock now |
| 650 | 650 | $autoblock->mExpiry = Block::getAutoblockExpiry( $timestamp ); |
| 651 | 651 | } else { |