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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bfd11a8..cd47634 100644 (file)
--- 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 b452b14..5bfce4e 100644 (file)
--- 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;
        }