From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 31 May 2006 08:05:38 +0000 (+0000)
Subject: * (bug 6126) Allow fallback to customized primary language when user language
X-Git-Tag: 1.31.0-rc.0~56955
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=1f1b942c964b371f007702706368555a05913ff2;p=lhc%2Fweb%2Fwiklou.git

* (bug 6126) Allow fallback to customized primary language when user language
  message contains '-'; fixes licenses selector on Commons configuration after
  recent addition of the message to Messages.php
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1a1a72446b..c4926e23d2 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -388,6 +388,10 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 5127) Auto edit summary when creating redirect page
 * (bug 3926) Introduce {{#language:}} magic word
 * Fix section links from edit comments for [[:Image:Bla.jpg]] in section titles
+* (bug 6126) Allow fallback to customized primary language when user language
+  message contains '-'; fixes licenses selector on Commons configuration after
+  recent addition of the message to Messages.php
+
 
 == Compatibility ==
 
diff --git a/includes/MessageCache.php b/includes/MessageCache.php
index a9fa1a445a..8e54af91c4 100644
--- a/includes/MessageCache.php
+++ b/includes/MessageCache.php
@@ -457,7 +457,7 @@ class MessageCache {
 		}
 
 		# Is this a custom message? Try the default language in the db...
-		if( $message === false &&
+		if( ($message === false || $message === '-' ) &&
 			!$this->mDisable && $useDB &&
 			!$isfullkey && ($langcode != $wgContLanguageCode) ) {
 			$message = $this->getFromCache( $lang->ucfirst( $key ) );