From dcde7e0a9221fd356695c683b6bb89d56416c361 Mon Sep 17 00:00:00 2001 From: Zheng Zhu Date: Mon, 11 Oct 2004 02:46:31 +0000 Subject: [PATCH] Adding the interface language to the page rendering hash; also fixed some formatting errors from my previous commits. --- includes/User.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/includes/User.php b/includes/User.php index dfe3c4fc01..11fce32d5c 100644 --- a/includes/User.php +++ b/includes/User.php @@ -171,11 +171,11 @@ class User { foreach ( $defOpt as $oname => $val ) { $this->mOptions[$oname] = $val; } - /* - default language setting - */ - $this->setOption('variant', $wgContLang->getPreferredVariant()); - $this->setOption('language', $wgContLang->getPreferredVariant()); + /* + default language setting + */ + $this->setOption('variant', $wgContLang->getPreferredVariant()); + $this->setOption('language', $wgContLang->getPreferredVariant()); } /** @@ -898,12 +898,12 @@ class User { $confstr .= '!' . $this->getOption( 'showtoc' ); $confstr .= '!' . $this->getOption( 'date' ); $confstr .= '!' . $this->getOption( 'numberheadings' ); - - // add in language variant option if there are multiple variants - // supported by the language object - if(sizeof($wgContLang->getVariants())>1) { - $confstr .= '!' . $this->getOption( 'variant' ); - } + $confstr .= '!' . $this->getOption( 'language' ); + // add in language variant option if there are multiple variants + // supported by the language object + if(sizeof($wgContLang->getVariants())>1) { + $confstr .= '!' . $this->getOption( 'variant' ); + } $this->mHash = $confstr; return $confstr ; -- 2.20.1