Also make it protected; no outside callers exist.
Change-Id: I9f35d05a5e031d1c536a44b19b108803db068677
* or false if populating empty cache fails. Also returns true if MessageCache
* is disabled.
*
* 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
*/
* @throws MWException
* @return bool
*/
- function load( $code = false, $mode = null ) {
+ protected function load( $code, $mode = null ) {
if ( !is_string( $code ) ) {
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...
}
# Don't do double loading...
}
$alreadyTried[ $langcode ] = true;
}
}
$alreadyTried[ $langcode ] = true;
}
+ } else {
+ $uckey = null;
- $message = $this->getMsgFromNamespace( $this->getMessagePageName( $code, $uckey ), $code );
+ $message = $this->getMsgFromNamespace(
+ $this->getMessagePageName( $code, $uckey ), $code );
if ( $message !== false ) {
return $message;
if ( $message !== false ) {
return $message;
];
public $mMainLanguageCode;
];
public $mMainLanguageCode;
- public $mVariants, $mVariantFallbacks, $mVariantNames;
+ public $mVariants;
+ public $mVariantFallbacks;
+ public $mVariantNames;
public $mTablesLoaded = false;
public $mTables;
// 'bidirectional' 'unidirectional' 'disable' for each variant
public $mTablesLoaded = false;
public $mTables;
// 'bidirectional' 'unidirectional' 'disable' for each variant