From: Aaron Schulz Date: Sun, 20 Apr 2008 23:57:30 +0000 (+0000) Subject: FORCE should only apply when no group given X-Git-Tag: 1.31.0-rc.0~48155 X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%20%22id_auteur=%24id%22%29%20.%20%22?a=commitdiff_plain;h=a1515f6ee5123def426bf85a8f7f6b991e3a7d0c;p=lhc%2Fweb%2Fwiklou.git FORCE should only apply when no group given --- diff --git a/includes/SpecialListusers.php b/includes/SpecialListusers.php index 9b456bc204..924bb5d990 100644 --- a/includes/SpecialListusers.php +++ b/includes/SpecialListusers.php @@ -61,6 +61,9 @@ class UsersPager extends AlphabeticPager { $conds[]='ipb_deleted IS NULL OR ipb_deleted = 0'; if ($this->requestedGroup != "") { $conds['ug_group'] = $this->requestedGroup; + $useIndex = ''; + } else { + $useIndex = 'FORCE INDEX (user_name)'; } if ($this->requestedUser != "") { $conds[] = 'user_name >= ' . wfGetDB()->addQuotes( $this->requestedUser ); @@ -69,7 +72,7 @@ class UsersPager extends AlphabeticPager { list ($user,$user_groups,$ipblocks) = wfGetDB()->tableNamesN('user','user_groups','ipblocks'); $query = array( - 'tables' => " $user FORCE INDEX(user_name) LEFT JOIN $user_groups ON user_id=ug_user + 'tables' => " $user $useIndex LEFT JOIN $user_groups ON user_id=ug_user LEFT JOIN $ipblocks ON user_id=ipb_user AND ipb_auto=0 ", 'fields' => array('user_name', 'MAX(user_id) AS user_id',