Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Reverting r28802 until I can figure what is going on

Browse source
This commit is contained in:
Niklas Laxström 2007-12-24 13:14:25 +00:00
parent 6417e231e6
commit e96e7ba96c
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
RELEASE-NOTES
View file

@ -267,7 +267,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
* (bug 12371) Handle more namespace case variants in namespaceDupes.php
* (bug 12380) Bot-friendly EditPage::spamPage
* (bug 8066) Spaces can't be entered in special page aliases
* (bug 10837) Interface "variant" overruling "language" preference
== Parser changes in 1.12 ==

17
includes/StubObject.php
View file

@ -91,16 +91,13 @@ class StubUserLang extends StubObject {
global $wgContLanguageCode, $wgRequest, $wgUser, $wgContLang;
$code = $wgRequest->getVal('uselang', $wgUser->getOption('language') );
// IF the content language has variants...
if ( $wgContLang->hasVariants() ) {
// AND IF the current interface language is the same as content language
if ( $code === $wgContLanguageCode ) {
// THEN use preferred variant as interface language.
// Happens when anonymous users or logged in users with default language
// setting selects a variant conversion.
$code = $wgContLang->getPreferredVariant();
}
}
// if variant is explicitely selected, use it instead the one from wgUser
// see bug #7605
if($wgContLang->hasVariants()){
$variant = $wgContLang->getPreferredVariant();
if($variant != $wgContLanguageCode)
$code = $variant;
}
# Validate $code
if( empty( $code ) || !preg_match( '/^[a-z-]+$/', $code ) ) {