diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2012-09-02 15:19:34 +0200 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2012-09-02 15:19:34 +0200 |
| commit | 9498a3d2852ace0f4ee23598f542dbce3fd2ec28 (patch) | |
| tree | 5aeced25a9fc09f93682788259f5c7d6d248634d /includes/specials/SpecialBlock.php | |
| parent | 588cc40aeec0165400421ef9612e81b6d2c7b936 (diff) | |
Update to MediaWiki 1.19.2
Diffstat (limited to 'includes/specials/SpecialBlock.php')
| -rw-r--r-- | includes/specials/SpecialBlock.php | 8 |
1 files changed, 7 insertions, 1 deletions
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 |