| Index: trunk/extensions/AbuseFilter/Views/AbuseFilterViewList.php |
| — | — | @@ -147,10 +147,9 @@ |
| 148 | 148 | |
| 149 | 149 | function getQueryInfo() { |
| 150 | 150 | $dbr = wfGetDB( DB_SLAVE ); |
| 151 | | - #$this->mConds[] = 'afa_filter=af_id'; |
| 152 | 151 | $abuse_filter = $dbr->tableName( 'abuse_filter' ); |
| 153 | 152 | return array( |
| 154 | | - 'tables' => array('abuse_filter', 'abuse_filter_action'), |
| | 153 | + 'tables' => array('abuse_filter'), |
| 155 | 154 | 'fields' => array( |
| 156 | 155 | 'af_id', |
| 157 | 156 | 'af_enabled', |
| — | — | @@ -165,10 +164,6 @@ |
| 166 | 165 | 'af_actions' |
| 167 | 166 | ), |
| 168 | 167 | 'conds' => $this->mConds, |
| 169 | | - 'options' => array( 'GROUP BY' => 'af_id' ), |
| 170 | | - 'join_conds' => array( |
| 171 | | - 'abuse_filter_action' => array( 'LEFT JOIN', 'afa_filter=af_id' ) |
| 172 | | - ) |
| 173 | 168 | ); |
| 174 | 169 | } |
| 175 | 170 | |
| Index: trunk/extensions/AbuseFilter/Views/AbuseFilterViewEdit.php |
| — | — | @@ -159,7 +159,8 @@ |
| 160 | 160 | // Do the update |
| 161 | 161 | $dbw->insert( 'abuse_filter_history', $afh_row, __METHOD__ ); |
| 162 | 162 | $history_id = $dbw->insertId(); |
| 163 | | - $dbw->delete( 'abuse_filter_action', array( 'afa_filter' => $filter ), __METHOD__ ); |
| | 163 | + if ($filter != 'new') |
| | 164 | + $dbw->delete( 'abuse_filter_action', array( 'afa_filter' => $filter ), __METHOD__ ); |
| 164 | 165 | $dbw->insert( 'abuse_filter_action', $actionsRows, __METHOD__ ); |
| 165 | 166 | |
| 166 | 167 | $dbw->commit(); |
| Index: trunk/extensions/AbuseFilter/Views/AbuseFilterViewExamine.php |
| — | — | @@ -226,7 +226,7 @@ |
| 227 | 227 | |
| 228 | 228 | // If one of these is true, we're abusefilter compatible. |
| 229 | 229 | $compatConds = array( |
| 230 | | - 'rc_this_oldid', |
| | 230 | + 'rc_this_oldid != 0', |
| 231 | 231 | 'rc_log_action' => array( 'move', 'create' ), |
| 232 | 232 | ); |
| 233 | 233 | |
| Index: trunk/extensions/AbuseFilter/AbuseFilter.class.php |
| — | — | @@ -818,15 +818,19 @@ |
| 819 | 819 | public static function storeVarDump( $vars, $global = false ) { |
| 820 | 820 | wfProfileIn( __METHOD__ ); |
| 821 | 821 | |
| | 822 | + global $wgCompressRevisions; |
| | 823 | + |
| 822 | 824 | if ( is_array( $vars ) || is_object( $vars ) ) |
| 823 | 825 | $text = serialize( $vars ); |
| 824 | 826 | else $text = $vars; |
| 825 | 827 | |
| 826 | 828 | $flags = array(); |
| 827 | 829 | |
| 828 | | - if (function_exists( 'gzdeflate' )) { |
| 829 | | - $text = gzdeflate( $text ); |
| 830 | | - $flags[] = 'gzip'; |
| | 830 | + if( $wgCompressRevisions ) { |
| | 831 | + if (function_exists( 'gzdeflate' )) { |
| | 832 | + $text = gzdeflate( $text ); |
| | 833 | + $flags[] = 'gzip'; |
| | 834 | + } |
| 831 | 835 | } |
| 832 | 836 | |
| 833 | 837 | // Store to ES if applicable |