From 734bbe46f1ce0ae448d2616a18d858a4f3a619c0 Mon Sep 17 00:00:00 2001 From: Jeroen De Dauw Date: Sun, 18 Mar 2012 16:07:21 +0000 Subject: [PATCH] fix < 1.19 compat, or at least some of it :) --- Captcha.php | 7 +++++-- ReCaptcha.class.php | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Captcha.php b/Captcha.php index 0cc5fac..3d6494f 100644 --- a/Captcha.php +++ b/Captcha.php @@ -181,7 +181,8 @@ class SimpleCaptcha { if ( $wgCaptchaWhitelistIP ) { global $wgRequest; - $ip = $wgRequest->getIP(); + // Compat: WebRequest::getIP is only available since MW 1.19. + $ip = method_exists( $wgRequest, 'getIP' ) ? $wgRequest->getIP() : wfGetIP(); foreach ( $wgCaptchaWhitelistIP as $range ) { if ( IP::isInRange( $ip, $range ) ) { @@ -199,7 +200,9 @@ class SimpleCaptcha { */ function badLoginKey() { global $wgRequest; - return wfMemcKey( 'captcha', 'badlogin', 'ip', $wgRequest->getIP() ); + // Compat: WebRequest::getIP is only available since MW 1.19. + $ip = method_exists( $wgRequest, 'getIP' ) ? $wgRequest->getIP() : wfGetIP(); + return wfMemcKey( 'captcha', 'badlogin', 'ip', $ip ); } /** diff --git a/ReCaptcha.class.php b/ReCaptcha.class.php index b0c15fb..a041aeb 100644 --- a/ReCaptcha.class.php +++ b/ReCaptcha.class.php @@ -36,9 +36,12 @@ class ReCaptcha extends SimpleCaptcha { return false; } + // Compat: WebRequest::getIP is only available since MW 1.19. + $ip = method_exists( $wgRequest, 'getIP' ) ? $wgRequest->getIP() : wfGetIP(); + $recaptcha_response = recaptcha_check_answer( $wgReCaptchaPrivateKey, - $wgRequest->getIP(), + $ip, $challenge, $response ); -- 2.30.2