From: Andrew Garrett <werdna@users.mediawiki.org>
Date: Mon, 20 Nov 2006 06:01:45 +0000 (+0000)
Subject: Fix bug reported by Slowking_Man where retroactive autoblocks take effect even if... 
X-Git-Tag: 1.31.0-rc.0~55143
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=a861fd02b653f595ce8b2e48b9b295ec22ccfdeb;p=lhc%2Fweb%2Fwiklou.git

Fix bug reported by Slowking_Man where retroactive autoblocks take effect even if the user being blocked was already blocked with autoblocks disabled.
---

diff --git a/includes/Block.php b/includes/Block.php
index a6646fca82..39ebe04c8b 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -400,7 +400,8 @@ class Block
 		$affected = $dbw->affectedRows();
 		$dbw->commit();
 
-		$this->doRetroactiveAutoblock();
+		if ($affected)
+			$this->doRetroactiveAutoblock();
 
 		return $affected;
 	}