Fixing bug 20524: Hideuser: Nicer error when trying to block hidden user without...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 159736d..5f8200f 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -540,6 +540,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 20885) Search box no longer suggests unavailable special pages
 * (bug 20948) "Create this page" on Special:Search is no longer displayed when
   searching for special pages
+* (bug 20524) Hideuser: Show nice error when trying to block hidden user without 
+  hideuser right
 
 == API changes in 1.16 ==
 

diff --git a/includes/specials/SpecialBlockip.php b/includes/specials/SpecialBlockip.php
index 2d9ab1c..54b96fe 100644 (file)
--- a/includes/specials/SpecialBlockip.php
+++ b/includes/specials/SpecialBlockip.php
@@ -454,7 +454,7 @@ class IPBlockForm {
                                        # If the name was hidden and the blocking user cannot hide
                                        # names, then don't allow any block changes...
                                        if( $currentBlock->mHideName && !$wgUser->isAllowed('hideuser') ) {
-                                               return array( 'hookaborted' );
+                                               return array( 'cant-see-hidden-user' );
                                        }
                                        $currentBlock->delete();
                                        $block->insert();

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 31fe0e0..3ac19e6 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -3001,6 +3001,7 @@ Please contact your Internet service provider or tech support and inform them of
 'sorbs_create_account_reason'     => 'Your IP address is listed as an open proxy in the DNSBL used by {{SITENAME}}.
 You cannot create an account',
 'cant-block-while-blocked'        => 'You cannot block other users while you are blocked.',
+'cant-see-hidden-user'            => 'The user you are trying to block has already been blocked and hidden. Since you do not have the hideuser right, you cannot see or edit the user\'s block.',
 
 # Developer tools
 'lockdb'              => 'Lock database',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index beb9dbc..1ffd79d 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -2024,6 +2024,7 @@ $wgMessageStructure = array(
                'sorbsreason',
                'sorbs_create_account_reason',
                'cant-block-while-blocked',
+               'cant-see-hidden-user'
        ),
        'developertools' => array(
                'lockdb',