From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Sun, 5 Apr 2009 01:32:21 +0000 (+0000)
Subject: setUsernameBitfields() should skip suppress log items
X-Git-Tag: 1.31.0-rc.0~42225
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=d17e2e15c83bd0fc739f4f0095e88d6d1e7ada94;p=lhc%2Fweb%2Fwiklou.git

setUsernameBitfields() should skip suppress log items
---

diff --git a/includes/specials/SpecialBlockip.php b/includes/specials/SpecialBlockip.php
index bffe386604..f25cb89fc3 100644
--- a/includes/specials/SpecialBlockip.php
+++ b/includes/specials/SpecialBlockip.php
@@ -521,7 +521,8 @@ class IPBlockForm {
 		$dbw->update( 'logging', array("log_deleted = log_deleted $op $delUser"),
 			array('log_user' => $userId), __METHOD__ );
 		$dbw->update( 'logging', array("log_deleted = log_deleted $op $delAction"),
-			array('log_namespace' => NS_USER, 'log_title' => $userDbKey), __METHOD__ );
+			array('log_namespace' => NS_USER, 'log_title' => $userDbKey,
+				"log_type != 'suppress'"), __METHOD__ );
 		# Hide name from RC
 		$dbw->update( 'recentchanges', array("rc_deleted = rc_deleted $op $delUser"),
 			array('rc_user_text' => $name), __METHOD__ );