From aac4b448cf71149506f273cad52d4311f8819f86 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 14 Oct 2016 19:11:51 -0700
Subject: [PATCH] Make MessageCache::load() require a language code

Also make it protected; no outside callers exist.

Change-Id: I9f35d05a5e031d1c536a44b19b108803db068677
---
 includes/cache/MessageCache.php | 16 ++++++++--------
 languages/LanguageConverter.php |  4 +++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index f393acde06..b746fdec84 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -227,17 +227,14 @@ class MessageCache {
 	 * or false if populating empty cache fails. Also returns true if MessageCache
 	 * is disabled.
 	 *
-	 * @param bool|string $code Language to which load messages
-	 * @param integer $mode Use MessageCache::FOR_UPDATE to skip process cache
+	 * @param string $code Language to which load messages
+	 * @param integer $mode Use MessageCache::FOR_UPDATE to skip process cache [optional]
 	 * @throws MWException
 	 * @return bool
 	 */
-	function load( $code = false, $mode = null ) {
+	protected function load( $code, $mode = null ) {
 		if ( !is_string( $code ) ) {
-			# This isn't really nice, so at least make a note about it and try to
-			# fall back
-			wfDebug( __METHOD__ . " called without providing a language code\n" );
-			$code = 'en';
+			throw new InvalidArgumentException( "Missing language code" );
 		}
 
 		# Don't do double loading...
@@ -864,6 +861,8 @@ class MessageCache {
 				}
 				$alreadyTried[ $langcode ] = true;
 			}
+		} else {
+			$uckey = null;
 		}
 
 		// Check the CDB cache
@@ -881,7 +880,8 @@ class MessageCache {
 					continue;
 				}
 
-				$message = $this->getMsgFromNamespace( $this->getMessagePageName( $code, $uckey ), $code );
+				$message = $this->getMsgFromNamespace(
+					$this->getMessagePageName( $code, $uckey ), $code );
 
 				if ( $message !== false ) {
 					return $message;
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 1c003adb4b..5a9f652ef0 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -48,7 +48,9 @@ class LanguageConverter {
 	];
 
 	public $mMainLanguageCode;
-	public $mVariants, $mVariantFallbacks, $mVariantNames;
+	public $mVariants;
+	public $mVariantFallbacks;
+	public $mVariantNames;
 	public $mTablesLoaded = false;
 	public $mTables;
 	// 'bidirectional' 'unidirectional' 'disable' for each variant
-- 
2.20.1