| Index: trunk/phase3/includes/specials/SpecialListusers.php |
| — | — | @@ -94,11 +94,8 @@ |
| 95 | 95 | $conds[] = 'user_editcount > 0'; |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | | - list ($user,$user_groups,$ipblocks) = $dbr->tableNamesN('user','user_groups','ipblocks'); |
| 99 | | - |
| 100 | 98 | $query = array( |
| 101 | | - 'tables' => " $user $useIndex LEFT JOIN $user_groups ON user_id=ug_user |
| 102 | | - LEFT JOIN $ipblocks ON user_id=ipb_user AND ipb_deleted=1 AND ipb_auto=0 ", |
| | 99 | + 'tables' => array( 'user', 'user_groups', 'ipblocks'), |
| 103 | 100 | 'fields' => array( |
| 104 | 101 | $this->creationSort ? 'MAX(user_name) AS user_name' : 'user_name', |
| 105 | 102 | $this->creationSort ? 'user_id' : 'MAX(user_id) AS user_id', |
| — | — | @@ -109,6 +106,10 @@ |
| 110 | 107 | 'MAX(ipb_deleted) AS ipb_deleted' // block/hide status |
| 111 | 108 | ), |
| 112 | 109 | 'options' => array('GROUP BY' => $this->creationSort ? 'user_id' : 'user_name'), |
| | 110 | + 'join_conds' => array( |
| | 111 | + 'user_groups' => array( 'LEFT JOIN', 'user_id=ug_user' ), |
| | 112 | + 'ipblocks' => array( 'LEFT JOIN', 'user_id=ipb_user AND ipb_deleted=1 AND ipb_auto=0' ), |
| | 113 | + ), |
| 113 | 114 | 'conds' => $conds |
| 114 | 115 | ); |
| 115 | 116 | |