From fa2ac031009e14e6ef55d6f4e74a4eb2cb948b13 Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Thu, 8 May 2008 10:05:32 +0000 Subject: [PATCH] Reverting r34388, DanTMan fixed Database::select() in r34442. --- includes/api/ApiQueryAllUsers.php | 4 ++-- includes/api/ApiQueryUsers.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php index 2dc86202f7..4c6914bf56 100644 --- a/includes/api/ApiQueryAllUsers.php +++ b/includes/api/ApiQueryAllUsers.php @@ -65,7 +65,7 @@ class ApiQueryAllUsers extends ApiQueryBase { if (!is_null($params['group'])) { // Filter only users that belong to a given group $tblName = $db->tableName('user_groups'); - $tables = "$tables INNER JOIN $tblName ug1 ON `ug1`.`ug_user`=`user_id`"; + $tables = "$tables INNER JOIN $tblName ug1 ON ug1.ug_user=user_id"; $this->addWhereFld('ug1.ug_group', $params['group']); } @@ -76,7 +76,7 @@ class ApiQueryAllUsers extends ApiQueryBase { $sqlLimit = $limit+$groupCount+1; $tblName = $db->tableName('user_groups'); - $tables = "$tables LEFT JOIN $tblName ug2 ON `ug2`.`ug_user`=`user_id`"; + $tables = "$tables LEFT JOIN $tblName ug2 ON ug2.ug_user=user_id"; $this->addFields('ug2.ug_group ug_group2'); } else { $sqlLimit = $limit+1; diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php index f331601144..c0cae506d2 100644 --- a/includes/api/ApiQueryUsers.php +++ b/includes/api/ApiQueryUsers.php @@ -80,13 +80,13 @@ if (!defined('MEDIAWIKI')) { if(isset($this->prop['groups'])) { $ug = $db->tableName('user_groups'); - $tables = "$tables LEFT JOIN $ug ON `ug_user`=`u1`.`user_id`"; + $tables = "$tables LEFT JOIN $ug ON ug_user=u1.user_id"; $this->addFields('ug_group'); } if(isset($this->prop['blockinfo'])) { $ipb = $db->tableName('ipblocks'); - $tables = "$tables LEFT JOIN $ipb ON `ipb_user`=`u1`.`user_id`"; - $tables = "$tables LEFT JOIN $userTable AS u2 ON `ipb_by`=`u2`.`user_id`"; + $tables = "$tables LEFT JOIN $ipb ON ipb_user=u1.user_id"; + $tables = "$tables LEFT JOIN $userTable AS u2 ON ipb_by=u2.user_id"; $this->addFields(array('ipb_reason', 'u2.user_name AS blocker_name')); } $this->addTables($tables); -- 2.20.1