From d9022f63880ce039446fba8364f68e656b7bf4cb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 3 May 2012 13:01:35 +0200
Subject: Update to MediaWiki 1.19.0

---
 includes/specials/SpecialBlockme.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'includes/specials/SpecialBlockme.php')

diff --git a/includes/specials/SpecialBlockme.php b/includes/specials/SpecialBlockme.php
index 40747667..3840b2ff 100644
--- 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 = wfGetIP();
-		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' );
 	}
 }
-- 
cgit v1.2.3-54-g00ecf