Bug 40668 - "Return to Array." when logging in

[lhc/web/wiklou.git] / includes / specials / SpecialBlockme.php

diff --git a/includes/specials/SpecialBlockme.php b/includes/specials/SpecialBlockme.php
index 66be933..3840b2f 100644 (file)
--- a/includes/specials/SpecialBlockme.php
+++ b/includes/specials/SpecialBlockme.php
@@ -33,18 +33,19 @@ class SpecialBlockme extends UnlistedSpecialPage {
        }
 
        function execute( $par ) {
-               global $wgRequest, $wgOut, $wgBlockOpenProxies, $wgProxyKey;
+               global $wgBlockOpenProxies, $wgProxyKey;
 
                $this->setHeaders();
                $this->outputHeader();
 
-               $ip = $wgRequest->getIP();
-               if( !$wgBlockOpenProxies || $wgRequest->getText( 'ip' ) != md5( $ip . $wgProxyKey ) ) {
-                       $wgOut->addWikiMsg( 'proxyblocker-disabled' );
+               $ip = $this->getRequest()->getIP();
+               if( !$wgBlockOpenProxies || $this->getRequest()->getText( 'ip' ) != md5( $ip . $wgProxyKey ) ) {
+                       $this->getOutput()->addWikiMsg( 'proxyblocker-disabled' );
                        return;
                }
 
-               $user = User::newFromName( wfMsgForContent( 'proxyblocker' ) );
+               $user = User::newFromName( $this->msg( 'proxyblocker' )->inContentLanguage()->text() );
+               # FIXME: newFromName could return false on a badly configured wiki.
                if ( !$user->isLoggedIn() ) {
                        $user->addToDatabase();
                }
@@ -52,10 +53,10 @@ class SpecialBlockme extends UnlistedSpecialPage {
                $block = new Block();
                $block->setTarget( $ip );
                $block->setBlocker( $user );
-               $block->mReason = wfMsg( 'proxyblockreason' );
+               $block->mReason = $this->msg( 'proxyblockreason' )->inContentLanguage()->text();
 
                $block->insert();
 
-               $wgOut->addWikiMsg( 'proxyblocksuccess' );
+               $this->getOutput()->addWikiMsg( 'proxyblocksuccess' );
        }
 }