wikimedia/mediawiki-extensions-ConfirmEdit
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/ConfirmEdit synced 2024-09-23 18:30:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Jeroen De Dauw 2012-03-18 16:07:21 +00:00
parent 8a0dfd0f95
commit 734bbe46f1
Notes: Jeroen De Dauw 2012-03-18 16:07:21 +00:00 
https://mediawiki.org/wiki/Special:Code/MediaWiki/114099
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Captcha.php
View file

@ -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 );
}
/**

5
ReCaptcha.class.php
View file

@ -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
);