Per Brion's suggestion, fixed blocker user detection: User::whoIs($wgUser->blockedBy());

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 6442fd5..02cbd41 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -743,16 +743,11 @@ class OutputPage {
                $this->setRobotpolicy( 'noindex,nofollow' );
                $this->setArticleRelated( false );
 
-               $id = $wgUser->blockedBy();
+               $name = User::whoIs( $wgUser->blockedBy() );
                $reason = $wgUser->blockedFor();
                $blockTimestamp = $wgLang->timeanddate( wfTimestamp( TS_MW, $wgUser->mBlock->mTimestamp ), true );
                $ip = wfGetIP();
 
-               if ( is_numeric( $id ) ) {
-                       $name = User::whoIs( $id );
-               } else {
-                       $name = $id;
-               }
                $link = '[[' . $wgContLang->getNsText( NS_USER ) . ":{$name}|{$name}]]";
 
                $blockid = $wgUser->mBlock->mId;

diff --git a/includes/api/ApiQueryUserInfo.php b/includes/api/ApiQueryUserInfo.php
index 6968b0b..a5b723f 100644 (file)
--- a/includes/api/ApiQueryUserInfo.php
+++ b/includes/api/ApiQueryUserInfo.php
@@ -55,8 +55,7 @@ class ApiQueryUserInfo extends ApiQueryBase {
                        $prop = array_flip($params['prop']);
                        if (isset($prop['blockinfo'])) {
                                if ($wgUser->isBlocked()) {
-                                       $id = $wgUser->blockedBy();
-                                       $vals['blockedby'] = is_numeric($id) ? User::whoIs($id) : $id;
+                                       $vals['blockedby'] = User::whoIs($wgUser->blockedBy());
                                        $vals['blockreason'] = $wgUser->blockedFor();
                                }
                        }