* (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 1a1a724..c4926e2 100644 (file)
--- 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 a9fa1a4..8e54af9 100644 (file)
--- 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 ) );