From: Rob Church <robchurch@users.mediawiki.org>
Date: Fri, 30 Jun 2006 08:34:21 +0000 (+0000)
Subject: * Fix potential PHP notice in Special:Blockme when $wgBlockOpenProxies is true
X-Git-Tag: 1.31.0-rc.0~56515
X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=c3a8e4371ec9d29e609e63ba9aa46eb93917e077;p=lhc%2Fweb%2Fwiklou.git

* Fix potential PHP notice in Special:Blockme when $wgBlockOpenProxies is true
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bfd11a8c89..cd476345e4 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -605,6 +605,7 @@ Some default configuration options have changed:
 * Added Javanese localization (jv)
 * (bug 6491) Apply bad image list in category galleries
 * (bug 6488) Show relevant log fragment in Special:Movepage
+* Fix potential PHP notice in Special:Blockme when $wgBlockOpenProxies is true
 
 == Compatibility ==
 
diff --git a/includes/SpecialBlockme.php b/includes/SpecialBlockme.php
index b452b14738..5bfce4eecd 100644
--- a/includes/SpecialBlockme.php
+++ b/includes/SpecialBlockme.php
@@ -8,14 +8,13 @@
 /**
  *
  */
-function wfSpecialBlockme()
-{
-	global $wgBlockOpenProxies, $wgOut, $wgProxyKey;
+function wfSpecialBlockme() {
+	global $wgRequest, $wgBlockOpenProxies, $wgOut, $wgProxyKey;
 
 	$ip = wfGetIP();
-
-	if ( !$wgBlockOpenProxies || $_REQUEST['ip'] != md5( $ip . $wgProxyKey ) ) {
-		$wgOut->addWikiText( wfMsg( "disabled" ) );
+	
+	if( !$wgBlockOpenProxies || $wgRequest->getText( 'ip' ) != md5( $ip . $wgProxyKey ) ) {
+		$wgOut->addWikiText( wfMsg( 'disabled' ) );
 		return;
 	}