| Index: branches/REL1_17/extensions/AbuseFilter/AbuseFilterVariableHolder.php |
| — | — | @@ -331,7 +331,7 @@ |
| 332 | 332 | |
| 333 | 333 | $users = array(); |
| 334 | 334 | foreach ( $res as $user ) { |
| 335 | | - $users[] = $user[0]; |
| | 335 | + $users[] = $user->rev_user_text; |
| 336 | 336 | } |
| 337 | 337 | $result = $users; |
| 338 | 338 | break; |
| Index: branches/REL1_17/extensions/AntiBot/available/GenericFormEncoding.php |
| — | — | @@ -10,7 +10,7 @@ |
| 11 | 11 | |
| 12 | 12 | $wgHooks['EditFilterMerged'][] = 'AntiBot_GenericFormEncoding::onEditFilterMerged'; |
| 13 | 13 | class AntiBot_GenericFormEncoding { |
| 14 | | - function onEditFilterMerged( $editPage, $text, &$hookError ) { |
| | 14 | + static function onEditFilterMerged( $editPage, $text, &$hookError ) { |
| 15 | 15 | if ( !function_exists( 'apache_request_headers' ) ) { |
| 16 | 16 | return true; |
| 17 | 17 | } |