fix < 1.19 compat, or at least some of it :)

diff --git a/Captcha.php b/Captcha.php
index 0cc5faccc8e37690e741039865354235fb9bb2b8..3d6494ffc928ea54045b75b1546216c7b820dc44 100644 (file)
--- a/Captcha.php
+++ b/Captcha.php
@@ -181,7 +181,8 @@ class SimpleCaptcha {
                if ( $wgCaptchaWhitelistIP ) {
                        global $wgRequest;
 
                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 ) ) {
 
                        foreach ( $wgCaptchaWhitelistIP as $range ) {
                                if ( IP::isInRange( $ip, $range ) ) {


@@ -199,7 +200,9 @@ class SimpleCaptcha {
         */
        function badLoginKey() {
                global $wgRequest;
         */
        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 b0c15fbda2edc1c9539acbaa08277986c29391ae..a041aeb1309fadac874655408f95bcb9c67445db 100644 (file)
--- a/ReCaptcha.class.php
+++ b/ReCaptcha.class.php
@@ -36,9 +36,12 @@ class ReCaptcha extends SimpleCaptcha {
                        return false;
                }
 
                        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,
                $recaptcha_response = recaptcha_check_answer(
                        $wgReCaptchaPrivateKey,

-                       $wgRequest->getIP(),
+                       $ip,

                        $challenge,
                        $response
                );
                        $challenge,
                        $response
                );