Reverting r34388, DanTMan fixed Database::select() in r34442.

diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php
index 2dc8620..4c6914b 100644 (file)
--- 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 f331601..c0cae50 100644 (file)
--- 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);