diff options
Diffstat (limited to 'extensions/ConfirmEdit/ReCaptcha.class.php')
| -rw-r--r-- | extensions/ConfirmEdit/ReCaptcha.class.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/extensions/ConfirmEdit/ReCaptcha.class.php b/extensions/ConfirmEdit/ReCaptcha.class.php index a041aeb1..59b31f47 100644 --- a/extensions/ConfirmEdit/ReCaptcha.class.php +++ b/extensions/ConfirmEdit/ReCaptcha.class.php @@ -36,8 +36,7 @@ class ReCaptcha extends SimpleCaptcha { return false; } - // Compat: WebRequest::getIP is only available since MW 1.19. - $ip = method_exists( $wgRequest, 'getIP' ) ? $wgRequest->getIP() : wfGetIP(); + $ip = $wgRequest->getIP(); $recaptcha_response = recaptcha_check_answer( $wgReCaptchaPrivateKey, @@ -70,16 +69,16 @@ class ReCaptcha extends SimpleCaptcha { * Show a message asking the user to enter a captcha on edit * The result will be treated as wiki text * - * @param $action Action being performed + * @param $action string Action being performed * @return string */ function getMessage( $action ) { $name = 'recaptcha-' . $action; - $text = wfMsg( $name ); + $text = wfMessage( $name )->text(); # Obtain a more tailored message, if possible, otherwise, fall back to # the default for edits - return wfEmptyMsg( $name, $text ) ? wfMsg( 'recaptcha-edit' ) : $text; + return wfMessage( $name, $text )->isDisabled() ? wfMessage( 'recaptcha-edit' )->text() : $text; } public function APIGetAllowedParams( &$module, &$params ) { |