[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make MessageCache::load() require a language code

2016-10-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Make MessageCache::load() require a language code
..


Make MessageCache::load() require a language code

Also make it protected; no outside callers exist.

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

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index f393acd..b746fde 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -227,17 +227,14 @@
 * 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 @@
}
$alreadyTried[ $langcode ] = true;
}
+   } else {
+   $uckey = null;
}
 
// Check the CDB cache
@@ -881,7 +880,8 @@
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 1c003ad..5a9f652 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -48,7 +48,9 @@
];
 
public $mMainLanguageCode;
-   public $mVariants, $mVariantFallbacks, $mVariantNames;
+   public $mVariants;
+   public $mVariantFallbacks;
+   public $mVariantNames;
public $mTablesLoaded = false;
public $mTables;
// 'bidirectional' 'unidirectional' 'disable' for each variant

-- 
To view, visit https://gerrit.wikimedia.org/r/316045
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9f35d05a5e031d1c536a44b19b108803db068677
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Liangent 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make MessageCache::load() require a language code

2016-10-14 Thread Aaron Schulz (Code Review) 
Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/316045

Change subject: Make MessageCache::load() require a language code
..

Make MessageCache::load() require a language code

Change-Id: I9f35d05a5e031d1c536a44b19b108803db068677
---
M includes/cache/MessageCache.php
M languages/LanguageConverter.php
2 files changed, 9 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/45/316045/1

diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index f393acd..2ef5782 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -232,12 +232,9 @@
 * @throws MWException
 * @return bool
 */
-   function load( $code = false, $mode = null ) {
+   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 @@
}
$alreadyTried[ $langcode ] = true;
}
+   } else {
+   $uckey = null;
}
 
// Check the CDB cache
@@ -881,7 +880,8 @@
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 1c003ad..5a9f652 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -48,7 +48,9 @@
];
 
public $mMainLanguageCode;
-   public $mVariants, $mVariantFallbacks, $mVariantNames;
+   public $mVariants;
+   public $mVariantFallbacks;
+   public $mVariantNames;
public $mTablesLoaded = false;
public $mTables;
// 'bidirectional' 'unidirectional' 'disable' for each variant

-- 
To view, visit https://gerrit.wikimedia.org/r/316045
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f35d05a5e031d1c536a44b19b108803db068677
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits