http://www.mediawiki.org/wiki/Special:Code/MediaWiki/57375
Revision: 57375
Author: churchofemacs
Date: 2009-10-05 11:30:52 +0000 (Mon, 05 Oct 2009)
Log Message:
-----------
Fixing bug 20524: Hideuser: Nicer error when trying to block hidden user
without hideuser right
Modified Paths:
--------------
trunk/phase3/RELEASE-NOTES
trunk/phase3/includes/specials/SpecialBlockip.php
trunk/phase3/languages/messages/MessagesEn.php
trunk/phase3/maintenance/language/messages.inc
Modified: trunk/phase3/RELEASE-NOTES
===================================================================
--- trunk/phase3/RELEASE-NOTES 2009-10-05 09:55:08 UTC (rev 57374)
+++ trunk/phase3/RELEASE-NOTES 2009-10-05 11:30:52 UTC (rev 57375)
@@ -540,6 +540,8 @@
* (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 ==
Modified: trunk/phase3/includes/specials/SpecialBlockip.php
===================================================================
--- trunk/phase3/includes/specials/SpecialBlockip.php 2009-10-05 09:55:08 UTC
(rev 57374)
+++ trunk/phase3/includes/specials/SpecialBlockip.php 2009-10-05 11:30:52 UTC
(rev 57375)
@@ -454,7 +454,7 @@
# 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();
Modified: trunk/phase3/languages/messages/MessagesEn.php
===================================================================
--- trunk/phase3/languages/messages/MessagesEn.php 2009-10-05 09:55:08 UTC
(rev 57374)
+++ trunk/phase3/languages/messages/MessagesEn.php 2009-10-05 11:30:52 UTC
(rev 57375)
@@ -3001,6 +3001,7 @@
'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',
Modified: trunk/phase3/maintenance/language/messages.inc
===================================================================
--- trunk/phase3/maintenance/language/messages.inc 2009-10-05 09:55:08 UTC
(rev 57374)
+++ trunk/phase3/maintenance/language/messages.inc 2009-10-05 11:30:52 UTC
(rev 57375)
@@ -2024,6 +2024,7 @@
'sorbsreason',
'sorbs_create_account_reason',
'cant-block-while-blocked',
+ 'cant-see-hidden-user'
),
'developertools' => array(
'lockdb',
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
