summaryrefslogtreecommitdiff
path: root/includes/api
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2013-03-05 09:06:02 +0100
committerPierre Schmitz <pierre@archlinux.de>2013-03-05 09:06:02 +0100
commit0edd6983ba69e8195fa7cade96eca27df9ebf237 (patch)
treee0a5a8ee7fac4c7ce9d308419d13dbca13a7a609 /includes/api
parent8ef4b96a9b23b2cfc0eed4da0d6d324da9f9da2f (diff)
Update to MediaWiki 1.20.3
Diffstat (limited to 'includes/api')
-rw-r--r--includes/api/ApiUnblock.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/api/ApiUnblock.php b/includes/api/ApiUnblock.php
index e34771fc..ff9ac474 100644
--- a/includes/api/ApiUnblock.php
+++ b/includes/api/ApiUnblock.php
@@ -79,7 +79,7 @@ class ApiUnblock extends ApiBase {
$res['id'] = $block->getId();
$target = $block->getType() == Block::TYPE_AUTO ? '' : $block->getTarget();
- $res['user'] = $target;
+ $res['user'] = $target instanceof User ? $target->getName() : $target;
$res['userid'] = $target instanceof User ? $target->getId() : 0;
$res['reason'] = $params['reason'];
$this->getResult()->addValue( null, $this->getModuleName(), $res );