| Index: trunk/phase3/includes/specials/SpecialActiveusers.php |
| — | — | @@ -49,6 +49,7 @@ |
| 50 | 50 | $dbr = wfGetDB( DB_SLAVE ); |
| 51 | 51 | $conds = array('rc_user > 0'); // Users - no anons |
| 52 | 52 | $conds[] = 'ipb_deleted IS NULL'; // don't show hidden names |
| | 53 | + $conds[] = 'rc_log_type IS NULL OR rc_log_type != "newusers"'; |
| 53 | 54 | $useIndex = $dbr->useIndexClause( 'rc_user_text' ); |
| 54 | 55 | if( $this->requestedUser != '' ) { |
| 55 | 56 | $conds[] = 'rc_user_text >= ' . $dbr->addQuotes( $this->requestedUser ); |
| — | — | @@ -57,12 +58,12 @@ |
| 58 | 59 | list( $recentchanges, $ipblocks, $user ) = $dbr->tableNamesN( 'recentchanges', 'ipblocks', 'user' ); |
| 59 | 60 | |
| 60 | 61 | $query = array( |
| 61 | | - 'tables' => " $recentchanges $useIndex |
| 62 | | - LEFT JOIN $ipblocks ON rc_user=ipb_user AND ipb_auto=0 AND ipb_deleted=1 |
| 63 | | - INNER JOIN $user ON rc_user=user_id ", |
| | 62 | + 'tables' => "$recentchanges $useIndex |
| | 63 | + INNER JOIN $user ON rc_user_text=user_name |
| | 64 | + LEFT JOIN $ipblocks ON user_id=ipb_user AND ipb_auto=0 AND ipb_deleted=1 ", |
| 64 | 65 | 'fields' => array( 'rc_user_text AS user_name', // inheritance |
| 65 | 66 | 'rc_user_text', // for Pager |
| 66 | | - 'MAX(rc_user) AS user_id', |
| | 67 | + 'user_id', |
| 67 | 68 | 'COUNT(*) AS recentedits', |
| 68 | 69 | 'MAX(ipb_user) AS blocked' ), |
| 69 | 70 | 'options' => array( 'GROUP BY' => 'rc_user_text' ), |