Amend Special:Ipblocklist to note when a block has autoblock DISABLED

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index cbce2f8..4d4bc3b 100644 (file)
--- 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 8d0ef10..c249e7f 100644 (file)
--- 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 1fd069a..bc23e34 100644 (file)
--- 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',