| Index: trunk/phase3/includes/api/ApiQueryAllUsers.php |
| — | — | @@ -65,7 +65,7 @@ |
| 66 | 66 | if (!is_null($params['group'])) { |
| 67 | 67 | // Filter only users that belong to a given group |
| 68 | 68 | $tblName = $db->tableName('user_groups'); |
| 69 | | - $tables = "$tables INNER JOIN $tblName ug1 ON ug1.ug_user=user_id"; |
| | 69 | + $tables = "$tables INNER JOIN $tblName ug1 ON `ug1`.`ug_user`=`user_id`"; |
| 70 | 70 | $this->addWhereFld('ug1.ug_group', $params['group']); |
| 71 | 71 | } |
| 72 | 72 | |
| — | — | @@ -76,7 +76,7 @@ |
| 77 | 77 | $sqlLimit = $limit+$groupCount+1; |
| 78 | 78 | |
| 79 | 79 | $tblName = $db->tableName('user_groups'); |
| 80 | | - $tables = "$tables LEFT JOIN $tblName ug2 ON ug2.ug_user=user_id"; |
| | 80 | + $tables = "$tables LEFT JOIN $tblName ug2 ON `ug2`.`ug_user`=`user_id`"; |
| 81 | 81 | $this->addFields('ug2.ug_group ug_group2'); |
| 82 | 82 | } else { |
| 83 | 83 | $sqlLimit = $limit+1; |
| Index: trunk/phase3/includes/api/ApiQueryUsers.php |
| — | — | @@ -80,13 +80,13 @@ |
| 81 | 81 | |
| 82 | 82 | if(isset($this->prop['groups'])) { |
| 83 | 83 | $ug = $db->tableName('user_groups'); |
| 84 | | - $tables = "$tables LEFT JOIN $ug ON ug_user=u1.user_id"; |
| | 84 | + $tables = "$tables LEFT JOIN $ug ON `ug_user`=`u1`.`user_id`"; |
| 85 | 85 | $this->addFields('ug_group'); |
| 86 | 86 | } |
| 87 | 87 | if(isset($this->prop['blockinfo'])) { |
| 88 | 88 | $ipb = $db->tableName('ipblocks'); |
| 89 | | - $tables = "$tables LEFT JOIN $ipb ON ipb_user=u1.user_id"; |
| 90 | | - $tables = "$tables LEFT JOIN $userTable AS u2 ON ipb_by=u2.user_id"; |
| | 89 | + $tables = "$tables LEFT JOIN $ipb ON `ipb_user`=`u1`.`user_id`"; |
| | 90 | + $tables = "$tables LEFT JOIN $userTable AS u2 ON `ipb_by`=`u2`.`user_id`"; |
| 91 | 91 | $this->addFields(array('ipb_reason', 'u2.user_name AS blocker_name')); |
| 92 | 92 | } |
| 93 | 93 | $this->addTables($tables); |
