Provide a unique message (ipb_blocked_as_range) if unblock of a single IP fails becau...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9b814c5..95fd681 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -64,6 +64,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   [[MediaWiki:Signature-anon]]
 * Signatures for anonymous users link to Special:Contributions page rather than user page
 * Added --override switch for disabled pages in updateSpecialPages.php
+* Provide a unique message (ipb_blocked_as_range) if unblock of a single IP fails 
+  because it is part of a blocked range.
 
 === Bug fixes in 1.12 ===
 

diff --git a/includes/SpecialIpblocklist.php b/includes/SpecialIpblocklist.php
index 6edbd7a..ab2b61d 100644 (file)
--- a/includes/SpecialIpblocklist.php
+++ b/includes/SpecialIpblocklist.php
@@ -163,7 +163,9 @@ class IPUnblockForm {
                                                && !strstr ( $this->ip, "/" ) ) {
                                        /* If the specified IP is a single address, and the block is
                                         * a range block, don't unblock the range. */
-                                       $block = null;
+
+                                       $this->showForm ( wfMsg ( 'ipb_blocked_as_range', $this->ip, $block->mAddress ) );
+                                       return;
                                }
                        }
                }

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 1ba304d..4c314ac 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2091,6 +2091,7 @@ the list of currently operational bans and blocks.',
 'ipb_expiry_invalid'          => 'Expiry time invalid.',
 'ipb_already_blocked'         => '"$1" is already blocked',
 'ipb_cant_unblock'            => 'Error: Block ID $1 not found. It may have been unblocked already.',
+'ipb_blocked_as_range'        => 'Error: The IP $1 is not blocked directly and cannot be unblocked. It is, however, blocked as part of the range $2, which can be unblocked.',
 'ip_range_invalid'            => 'Invalid IP range.',
 'blockme'                     => 'Block me',
 'proxyblocker'                => 'Proxy blocker',