r87162 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r87161‎ | r87162 | r87163 >
Date:11:44, 30 April 2011
Author:catrope
Status:ok
Tags:
Comment:
1.17wmf1: Fix bug in auprop=blockinfo, presumably caused by a botched merge.
Modified paths:
  • /branches/wmf/1.17wmf1/includes/api/ApiQueryAllUsers.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.17wmf1/includes/api/ApiQueryAllUsers.php
@@ -157,8 +157,8 @@
158158 'name' => $lastUser,
159159 'userid' => $row->user_id,
160160 );
161 - if ( $fld_blockinfo && !is_null( $row->blocker_name ) ) {
162 - $lastUserData['blockedby'] = $row->blocker_name;
 161+ if ( $fld_blockinfo && !is_null( $row->ipb_by_text ) ) {
 162+ $lastUserData['blockedby'] = $row->ipb_by_text;
163163 $lastUserData['blockreason'] = $row->ipb_reason;
164164 }
165165 if ( $row->ipb_deleted ) {

Status & tagging log