From 4a40a24b4f6b823d6cd9b6dae267150f4364eecc Mon Sep 17 00:00:00 2001
From: Andrew Garrett <werdna@users.mediawiki.org>
Date: Wed, 1 Nov 2006 13:01:50 +0000
Subject: [PATCH] Amend Special:Ipblocklist to note when a block has autoblock
 DISABLED

---
 RELEASE-NOTES                     | 2 +-
 includes/SpecialIpblocklist.php   | 6 +++++-
 languages/messages/MessagesEn.php | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index cbce2f8447..4d4bc3b2b8 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -118,7 +118,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   login/logout link
 * Fix for parser tests with MySQL 5 in strict mode
 * Added block option "enable autoblocks"
-
+* Amend Special:Ipblocklist to note when a block has autoblock DISABLED.
 
 == Languages updated ==
 
diff --git a/includes/SpecialIpblocklist.php b/includes/SpecialIpblocklist.php
index 8d0ef1029d..c249e7fe7a 100644
--- a/includes/SpecialIpblocklist.php
+++ b/includes/SpecialIpblocklist.php
@@ -241,7 +241,7 @@ class IPUnblockForm {
 		if( is_null( $msg ) ) {
 			$msg = array();
 			$keys = array( 'infiniteblock', 'expiringblock', 'contribslink', 'unblocklink', 
-				'anononlyblock', 'createaccountblock' );
+				'anononlyblock', 'createaccountblock', 'noautoblockblock' );
 			foreach( $keys as $key ) {
 				$msg[$key] = wfMsgHtml( $key );
 			}
@@ -277,6 +277,10 @@ class IPUnblockForm {
 		if ( $block->mCreateAccount ) {
 			$properties[] = $msg['createaccountblock'];
 		}
+		if (!$block->mEnableAutoblock ) {
+			$properties[] = $msg['noautoblockblock'];
+		}
+
 		$properties = implode( ', ', $properties );
 
 		$line = wfMsgReplaceArgs( $msg['blocklistline'], array( $formattedTime, $blocker, $target, $properties ) );
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 1fd069a951..bc23e34963 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1774,6 +1774,7 @@ to a previously blocked IP address or username.',
 'infiniteblock' => 'infinite',
 'expiringblock' => 'expires $1',
 'anononlyblock' => 'anon. only',
+'noautoblockblock' => 'autoblock disabled',
 'createaccountblock' => 'account creation blocked',
 'ipblocklistempty'	=> 'The blocklist is empty.',
 'blocklink'		=> 'block',
-- 
2.20.1