From 9498a3d2852ace0f4ee23598f542dbce3fd2ec28 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 2 Sep 2012 15:19:34 +0200 Subject: Update to MediaWiki 1.19.2 --- includes/specials/SpecialBlock.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'includes/specials/SpecialBlock.php') diff --git a/includes/specials/SpecialBlock.php b/includes/specials/SpecialBlock.php index 7d93cc75..da8eed1b 100644 --- a/includes/specials/SpecialBlock.php +++ b/includes/specials/SpecialBlock.php @@ -257,7 +257,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 -- cgit v1.2.3-54-g00ecf