From 66894363d8468bdb95e6627600a25fc075aeef14 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Sat, 18 Jun 2011 00:29:32 +0000
Subject: [PATCH] Tweaked comments and code in confusing spot of doAutoblock()

---
 includes/Block.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/includes/Block.php b/includes/Block.php
index 5afe5c55a6..cadeabd23b 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -579,35 +579,35 @@ class Block {
 			return false;
 		}
 
-		# Check for presence on the autoblock whitelist
+		# Check for presence on the autoblock whitelist.
 		if ( self::isWhitelistedFromAutoblocks( $autoblockIP ) ) {
 			return false;
 		}
 
-		# # Allow hooks to cancel the autoblock.
+		# Allow hooks to cancel the autoblock.
 		if ( !wfRunHooks( 'AbortAutoblock', array( $autoblockIP, &$this ) ) ) {
 			wfDebug( "Autoblock aborted by hook.\n" );
 			return false;
 		}
 
-		# It's okay to autoblock. Go ahead and create/insert the block.
+		# It's okay to autoblock. Go ahead and insert/update the block...
 
+		# Do not add a *new* block if the IP is already blocked.
 		$ipblock = Block::newFromTarget( $autoblockIP );
 		if ( $ipblock ) {
-			# If the user is already blocked. Then check if the autoblock would
-			# exceed the user block. If it would exceed, then do nothing, else
-			# prolong block time
-			if ( $this->mExpiry > Block::getAutoblockExpiry( $ipblock->mTimestamp )
+			# Check if the block is an autoblock and would exceed the user block
+			# if renewed. If so, do nothing, otherwise prolong the block time...
+			if ( $ipblock->mAuto && // @TODO: why not compare $ipblock->mExpiry?
+				$this->mExpiry > Block::getAutoblockExpiry( $ipblock->mTimestamp )
 			) {
-				# If the block is an autoblock, reset its timestamp to now and its expiry
-				# to an $wgAutoblockExpiry in the future; otherwise do nothing
+				# Reset block timestamp to now and its expiry to
+				# $wgAutoblockExpiry in the future
 				$ipblock->updateTimestamp();
 			}
 			return false;
-
 		}
 
-		# Make a new block object with the desired properties
+		# Make a new block object with the desired properties.
 		$autoblock = new Block;
 		wfDebug( "Autoblocking {$this->getTarget()}@" . $autoblockIP . "\n" );
 		$autoblock->setTarget( $autoblockIP );
@@ -630,7 +630,7 @@ class Block {
 			$autoblock->mExpiry = min( $this->mExpiry, Block::getAutoblockExpiry( wfTimestampNow() ) );
 		}
 
-		# Insert it
+		# Insert the block...
 		$status = $autoblock->insert();
 		return $status
 			? $status['id']
-- 
2.20.1