| Index: trunk/extensions/CheckUser/CheckUser_body.php |
| — | — | @@ -869,7 +869,7 @@ |
| 870 | 870 | array( 'comma-separator', 'checkuser-log-userips', 'checkuser-log-ipedits', 'checkuser-log-ipusers', |
| 871 | 871 | 'checkuser-log-ipedits-xff', 'checkuser-log-ipusers-xff' ) );*/ |
| 872 | 872 | |
| 873 | | - $this->searchConds = $searchConds; |
| | 873 | + $this->searchConds = $searchConds ? $searchConds : array(); |
| 874 | 874 | $this->specialPage = $specialPage; |
| 875 | 875 | } |
| 876 | 876 | |
| — | — | @@ -926,10 +926,11 @@ |
| 927 | 927 | |
| 928 | 928 | function getQueryInfo() { |
| 929 | 929 | global $wgRequest; |
| | 930 | + $this->searchConds[] = 'user_id = cul_user'; |
| 930 | 931 | return array( |
| 931 | 932 | 'tables' => array('cu_log','user'), |
| 932 | 933 | 'fields' => $this->selectFields(), |
| 933 | | - 'conds' => $this->searchConds + array('user_id = cul_user') |
| | 934 | + 'conds' => $this->searchConds |
| 934 | 935 | ); |
| 935 | 936 | } |
| 936 | 937 | |
| — | — | @@ -946,4 +947,3 @@ |
| 947 | 948 | 'cul_target_id','cul_target_text','user_name'); |
| 948 | 949 | } |
| 949 | 950 | } |
| 950 | | - |