aboutsummaryrefslogtreecommitdiffstats
path: root/includes/User.php
diff options
context:
space:
mode:
authorZheng Zhu <zhengzhu@users.mediawiki.org>2004-12-07 22:23:21 +0000
committerZheng Zhu <zhengzhu@users.mediawiki.org>2004-12-07 22:23:21 +0000
commit405b5431121c1890e56dcc64b034dd457edcb5b9 (patch)
tree3193c76adcd1f8a37a47396732f0f9c47e7bb87a /includes/User.php
parentb03fbbff778eb0563de5c1bd14cc517a5d2e8a07 (diff)
downloadmediawikicore-405b5431121c1890e56dcc64b034dd457edcb5b9.tar.gz
mediawikicore-405b5431121c1890e56dcc64b034dd457edcb5b9.zip
added user option to disable Chinese language conversion
Notes
Notes: http://mediawiki.org/wiki/Special:Code/MediaWiki/6569
Diffstat (limited to 'includes/User.php')
-rw-r--r--includes/User.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/includes/User.php b/includes/User.php
index 90b2dfeb5531..f46c9f0d7459 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1012,7 +1012,7 @@ class User {
}
function getPageRenderingHash() {
- global $wgContLang;
+ global $wgContLang;
if( $this->mHash ){
return $this->mHash;
}
@@ -1029,10 +1029,10 @@ class User {
$confstr .= '!' . $this->getOption( 'date' );
$confstr .= '!' . $this->getOption( 'numberheadings' );
$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' );
+ // add in language specific options, if any
+ $extra = $wgContLang->getExtraHashOptions();
+ foreach( $extra as $e ) {
+ $confstr .= '!' . $this->getOption( $e );
}
$this->mHash = $confstr;