From: Zheng Zhu <zhengzhu@users.mediawiki.org>
Date: Mon, 11 Oct 2004 02:46:31 +0000 (+0000)
Subject: Adding the interface language to the page rendering hash; also fixed some formatting... 
X-Git-Tag: 1.5.0alpha1~1604
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=dcde7e0a9221fd356695c683b6bb89d56416c361;p=lhc%2Fweb%2Fwiklou.git

Adding the interface language to the page rendering hash; also fixed some formatting errors from my previous commits.
---

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 ;