From 51a6eadec19de1df84213c9c98fd24d7876a8777 Mon Sep 17 00:00:00 2001
From: John Du Hart <johnduhart@users.mediawiki.org>
Date: Wed, 23 Nov 2011 10:28:21 +0000
Subject: [PATCH] Followup r103817, updating setLang usages

---
 includes/context/DerivativeContext.php | 10 ++++++++++
 includes/context/RequestContext.php    | 10 ++++++++++
 includes/parser/Parser.php             |  2 +-
 includes/specials/SpecialUserlogin.php |  2 +-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/includes/context/DerivativeContext.php b/includes/context/DerivativeContext.php
index a6a36d74f6..e440575be3 100644
--- a/includes/context/DerivativeContext.php
+++ b/includes/context/DerivativeContext.php
@@ -158,9 +158,19 @@ class DerivativeContext extends ContextSource {
 	/**
 	 * Set the Language object
 	 *
+	 * @deprecated 1.19 Use setLanguage instead
 	 * @param $l Mixed Language instance or language code
 	 */
 	public function setLang( $l ) {
+		$this->setLanguage( $l );
+	}
+
+	/**
+	 * Set the Language object
+	 *
+	 * @param $l Mixed Language instance or language code
+	 */
+	public function setLanguage( $l ) {
 		if ( $l instanceof Language ) {
 			$this->lang = $l;
 		} elseif ( is_string( $l ) ) {
diff --git a/includes/context/RequestContext.php b/includes/context/RequestContext.php
index 631d60d366..7ca184a7f1 100644
--- a/includes/context/RequestContext.php
+++ b/includes/context/RequestContext.php
@@ -165,9 +165,19 @@ class RequestContext implements IContextSource {
 	/**
 	 * Set the Language object
 	 *
+	 * @deprecated 1.19 Use setLanguage instead
 	 * @param $l Mixed Language instance or language code
 	 */
 	public function setLang( $l ) {
+		$this->setLanguage( $l );
+	}
+
+	/**
+	 * Set the Language object
+	 *
+	 * @param $l Mixed Language instance or language code
+	 */
+	public function setLanguage( $l ) {
 		if ( $l instanceof Language ) {
 			$this->lang = $l;
 		} elseif ( is_string( $l ) ) {
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index d62258834a..3c41eb3d4a 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -3250,7 +3250,7 @@ class Parser {
 					$context->setTitle( $title );
 					$context->setRequest( new FauxRequest( $pageArgs ) );
 					$context->setUser( $this->getUser() );
-					$context->setLang( $this->mOptions->getUserLangObj() );
+					$context->setLanguage( $this->mOptions->getUserLangObj() );
 					$ret = SpecialPageFactory::capturePath( $title, $context );
 					if ( $ret ) {
 						$text = $context->getOutput()->getHTML();
diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index ed5133289e..b2014efa5b 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -744,7 +744,7 @@ class LoginForm extends SpecialPage {
 					$code = $request->getVal( 'uselang', $user->getOption( 'language' ) );
 					$userLang = Language::factory( $code );
 					$wgLang = $userLang;
-					$this->getContext()->setLang( $userLang );
+					$this->getContext()->setLanguage( $userLang );
 					return $this->successfulLogin();
 				} else {
 					return $this->cookieRedirectCheck( 'login' );
-- 
2.20.1