From: Timo Tijhof <krinklemail@gmail.com>
Date: Wed, 19 Mar 2014 21:41:18 +0000 (+0100)
Subject: resourceloader: Sanitize lang code before creating Language object
X-Git-Tag: 1.31.0-rc.0~16470^2
X-Git-Url: http://git.cyclocoop.org/data/Fool?a=commitdiff_plain;h=451a929c878c448b1014f3d2df924fa03604dd1a;p=lhc%2Fweb%2Fwiklou.git

resourceloader: Sanitize lang code before creating Language object

Bug: 62849
Change-Id: I6af7818c4d8d2201ac4e1a4050b92fea56d90306
---

diff --git a/includes/resourceloader/ResourceLoaderContext.php b/includes/resourceloader/ResourceLoaderContext.php
index b90ca44b98..0d9ef78cc8 100644
--- a/includes/resourceloader/ResourceLoaderContext.php
+++ b/includes/resourceloader/ResourceLoaderContext.php
@@ -142,11 +142,8 @@ class ResourceLoaderContext {
 	 */
 	public function getLanguage() {
 		if ( $this->language === null ) {
-			global $wgLang;
-			$this->language = $this->request->getVal( 'lang' );
-			if ( !$this->language ) {
-				$this->language = $wgLang->getCode();
-			}
+			// Must be a valid language code after this point (bug 62849)
+			$this->language = RequestContext::sanitizeLangCode( $this->request->getVal( 'lang' ) );
 		}
 		return $this->language;
 	}
@@ -158,7 +155,7 @@ class ResourceLoaderContext {
 		if ( $this->direction === null ) {
 			$this->direction = $this->request->getVal( 'dir' );
 			if ( !$this->direction ) {
-				# directionality based on user language (see bug 6100)
+				// Determine directionality based on user language (bug 6100)
 				$this->direction = Language::factory( $this->getLanguage() )->getDir();
 			}
 		}