| Index: trunk/extensions/AbuseFilter/AbuseFilter.parser.php |
| — | — | @@ -592,7 +592,7 @@ |
| 593 | 593 | if ( !$this->mVars->varIsSet( $varname ) ) { |
| 594 | 594 | throw new AFPUserVisibleException( 'unrecognisedvar', |
| 595 | 595 | $this->mCur->pos, |
| 596 | | - array( $var ) |
| | 596 | + array( $varname ) |
| 597 | 597 | ); |
| 598 | 598 | } |
| 599 | 599 | $list = $this->mVars->getVar( $varname ); |
| Index: trunk/extensions/AbuseFilter/Views/AbuseFilterViewList.php |
| — | — | @@ -52,7 +52,8 @@ |
| 53 | 53 | |
| 54 | 54 | $pager = new AbuseFilterPager( $this, $conds ); |
| 55 | 55 | |
| 56 | | - extract( $optarray ); |
| | 56 | + $deleted = $optarray['deleted']; |
| | 57 | + $hidedisabled = $optarray['hidedisabled']; |
| 57 | 58 | |
| 58 | 59 | # Options form |
| 59 | 60 | $fields = array(); |
| Index: trunk/extensions/AbuseFilter/Views/AbuseFilterView.php |
| — | — | @@ -8,6 +8,10 @@ |
| 9 | 9 | $this->mParams = $params; |
| 10 | 10 | } |
| 11 | 11 | |
| | 12 | + /** |
| | 13 | + * @param string $subpage |
| | 14 | + * @return Title |
| | 15 | + */ |
| 12 | 16 | function getTitle( $subpage = '' ) { |
| 13 | 17 | return $this->mPage->getTitle( $subpage ); |
| 14 | 18 | } |
| Index: trunk/extensions/AbuseFilter/AbuseFilter.class.php |
| — | — | @@ -167,6 +167,11 @@ |
| 168 | 168 | $out->addHTML( $linkStr ); |
| 169 | 169 | } |
| 170 | 170 | |
| | 171 | + /** |
| | 172 | + * @static |
| | 173 | + * @param $user User |
| | 174 | + * @return AbuseFilterVariableHolder |
| | 175 | + */ |
| 171 | 176 | public static function generateUserVars( $user ) { |
| 172 | 177 | $vars = new AbuseFilterVariableHolder; |
| 173 | 178 | |
| — | — | @@ -279,6 +284,12 @@ |
| 280 | 285 | self::$condLimitEnabled = false; |
| 281 | 286 | } |
| 282 | 287 | |
| | 288 | + /** |
| | 289 | + * @static |
| | 290 | + * @param $title Title |
| | 291 | + * @param $prefix |
| | 292 | + * @return AbuseFilterVariableHolder |
| | 293 | + */ |
| 283 | 294 | public static function generateTitleVars( $title, $prefix ) { |
| 284 | 295 | $vars = new AbuseFilterVariableHolder; |
| 285 | 296 | |
| — | — | @@ -1215,8 +1226,6 @@ |
| 1216 | 1227 | |
| 1217 | 1228 | wfProfileIn( __METHOD__ ); |
| 1218 | 1229 | |
| 1219 | | - $blocking_filters = array_keys( array_filter( $filters ) ); |
| 1220 | | - |
| 1221 | 1230 | // Figure out if we've triggered overflows and blocks. |
| 1222 | 1231 | $overflow_triggered = ( self::$condCount > $wgAbuseFilterConditionLimit ); |
| 1223 | 1232 | |
| Index: trunk/extensions/AbuseFilter/AbuseFilter.hooks.php |
| — | — | @@ -164,6 +164,11 @@ |
| 165 | 165 | return true; |
| 166 | 166 | } |
| 167 | 167 | |
| | 168 | + /** |
| | 169 | + * @static |
| | 170 | + * @param $updater DatabaseUpdater |
| | 171 | + * @return bool |
| | 172 | + */ |
| 168 | 173 | public static function onLoadExtensionSchemaUpdates( $updater = null ) { |
| 169 | 174 | $dir = dirname( __FILE__ ); |
| 170 | 175 | |