From 764716c641816516195255512a058d49918f6154 Mon Sep 17 00:00:00 2001 From: csteipp Date: Wed, 8 Aug 2012 10:04:10 -0700 Subject: [PATCH] (bug 35839) Check permisions for revdel blocks If a block includes the "Hide username" to revdel the username, check that the user has permission to 'hideuser' before showing the reason for the block. Other metadata about the block (expiration, limits) will still be visible to admins. Change-Id: I50a49ea6876b99a944d27f7c34910f0aa47556c3 --- includes/specials/SpecialBlock.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/includes/specials/SpecialBlock.php b/includes/specials/SpecialBlock.php index b6484ce4d8..504839a738 100644 --- a/includes/specials/SpecialBlock.php +++ b/includes/specials/SpecialBlock.php @@ -258,7 +258,13 @@ class SpecialBlock extends FormSpecialPage { $fields['DisableUTEdit']['default'] = $block->prevents( 'editownusertalk' ); } - $fields['Reason']['default'] = $block->mReason; + // If the username was hidden (ipb_deleted == 1), don't show the reason + // unless this user also has rights to hideuser: Bug 35839 + if ( !$block->mHideName || $this->getUser()->isAllowed( 'hideuser' ) ) { + $fields['Reason']['default'] = $block->mReason; + } else { + $fields['Reason']['default'] = ''; + } if( $this->getRequest()->wasPosted() ){ # Ok, so we got a POST submission asking us to reblock a user. So show the -- 2.20.1