diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
| commit | 6dc1997577fab2c366781fd7048144935afa0012 (patch) | |
| tree | 8918d28c7ab4342f0738985e37af1dfc42d0e93a /includes/api/ApiUnblock.php | |
| parent | 150f94f051128f367bc89f6b7e5f57eb2a69fc62 (diff) | |
| parent | fa89acd685cb09cdbe1c64cbb721ec64975bbbc1 (diff) | |
Merge commit 'fa89acd'
# Conflicts:
# .gitignore
# extensions/ArchInterWiki.sql
Diffstat (limited to 'includes/api/ApiUnblock.php')
| -rw-r--r-- | includes/api/ApiUnblock.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/includes/api/ApiUnblock.php b/includes/api/ApiUnblock.php index 1af83ba3..f6c24b76 100644 --- a/includes/api/ApiUnblock.php +++ b/includes/api/ApiUnblock.php @@ -53,7 +53,13 @@ class ApiUnblock extends ApiBase { if ( $user->isBlocked() ) { $status = SpecialBlock::checkUnblockSelf( $params['user'], $user ); if ( $status !== true ) { - $this->dieUsageMsg( $status ); + $msg = $this->parseMsg( $status ); + $this->dieUsage( + $msg['info'], + $msg['code'], + 0, + array( 'blockinfo' => ApiQueryUserInfo::getBlockInfo( $user->getBlock() ) ) + ); } } |