| Index: trunk/phase3/includes/MessageCache.php |
| — | — | @@ -457,7 +457,7 @@ |
| 458 | 458 | } |
| 459 | 459 | |
| 460 | 460 | # Is this a custom message? Try the default language in the db... |
| 461 | | - if( $message === false && |
| | 461 | + if( ($message === false || $message === '-' ) && |
| 462 | 462 | !$this->mDisable && $useDB && |
| 463 | 463 | !$isfullkey && ($langcode != $wgContLanguageCode) ) { |
| 464 | 464 | $message = $this->getFromCache( $lang->ucfirst( $key ) ); |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -388,7 +388,11 @@ |
| 389 | 389 | * (bug 5127) Auto edit summary when creating redirect page |
| 390 | 390 | * (bug 3926) Introduce {{#language:}} magic word |
| 391 | 391 | * Fix section links from edit comments for [[:Image:Bla.jpg]] in section titles |
| | 392 | +* (bug 6126) Allow fallback to customized primary language when user language |
| | 393 | + message contains '-'; fixes licenses selector on Commons configuration after |
| | 394 | + recent addition of the message to Messages.php |
| 392 | 395 | |
| | 396 | + |
| 393 | 397 | == Compatibility == |
| 394 | 398 | |
| 395 | 399 | MediaWiki 1.7 requires PHP 5 (5.1 recommended). PHP 4 is no longer supported. |