From 5dd20241aba0d574edc8abfd414a19311b1c8981 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 27 Apr 2007 15:12:22 +0000 Subject: [PATCH] Reverting r21560 as discussed; there are severe problems with relying on a user-language variable, which is why it has not been added. --- includes/MagicWord.php | 1 - includes/Parser.php | 6 ++---- languages/messages/MessagesEn.php | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/includes/MagicWord.php b/includes/MagicWord.php index e8fc59a26f..bf72a0c841 100644 --- a/includes/MagicWord.php +++ b/includes/MagicWord.php @@ -97,7 +97,6 @@ class MagicWord { 'localtimestamp', 'directionmark', 'language', - 'userlanguage', 'contentlanguage', 'pagesinnamespace', 'numberofadmins', diff --git a/includes/Parser.php b/includes/Parser.php index f92c829661..8e36e170de 100644 --- a/includes/Parser.php +++ b/includes/Parser.php @@ -2560,11 +2560,9 @@ class Parser return $wgScriptPath; case 'directionmark': return $wgContLang->getDirMark(); - case 'userlanguage': - global $wgLang; - return $wgLang->getCode(); case 'contentlanguage': - return $wgContLang->getCode(); + global $wgContLanguageCode; + return $wgContLanguageCode; default: $ret = null; if ( wfRunHooks( 'ParserGetVariableValueSwitch', array( &$this, &$varCache, &$index, &$ret ) ) ) diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index f1c6500318..a2ad2f3aec 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -329,7 +329,6 @@ $magicWords = array( 'localtimestamp' => array( 1, 'LOCALTIMESTAMP' ), 'directionmark' => array( 1, 'DIRECTIONMARK', 'DIRMARK' ), 'language' => array( 0, '#LANGUAGE:' ), - 'userlanguage' => array( 1, 'USERLANGUAGE', 'USERLANG' ), 'contentlanguage' => array( 1, 'CONTENTLANGUAGE', 'CONTENTLANG' ), 'pagesinnamespace' => array( 1, 'PAGESINNAMESPACE:', 'PAGESINNS:' ), 'numberofadmins' => array( 1, 'NUMBEROFADMINS' ), -- 2.20.1