summaryrefslogtreecommitdiff
path: root/languages/LanguageConverter.php
diff options
context:
space:
mode:
Diffstat (limited to 'languages/LanguageConverter.php')
-rw-r--r--languages/LanguageConverter.php12
1 files changed, 5 insertions, 7 deletions
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 316bcb12..d352f645 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -1,7 +1,6 @@
<?php
/**
- * @package MediaWiki
- * @subpackage Language
+ * @addtogroup Language
*
* @author Zhengzhu Feng <zhengzhu@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
@@ -36,7 +35,6 @@ class LanguageConverter {
$variantfallbacks=array(),
$markup=array(),
$flags = array()) {
- global $wgLegalTitleChars;
$this->mLangObj = $langobj;
$this->mMainLanguageCode = $maincode;
$this->mVariants = $variants;
@@ -275,7 +273,7 @@ class LanguageConverter {
function parserConvert( $text, &$parser ) {
global $wgDisableLangConversion;
/* don't do anything if this is the conversion table */
- if ( $parser->mTitle->getNamespace() == NS_MEDIAWIKI &&
+ if ( $parser->getTitle()->getNamespace() == NS_MEDIAWIKI &&
strpos($parser->mTitle->getText(), "Conversiontable") !== false )
{
return $text;
@@ -408,10 +406,11 @@ class LanguageConverter {
$carray = $this->parseManualRule($rules, $flags);
$disp = '';
- if(array_key_exists($plang, $carray))
+ if(array_key_exists($plang, $carray)) {
$disp = $carray[$plang];
- else if(array_key_exists($fallback, $carray))
+ } else if(array_key_exists($fallback, $carray)) {
$disp = $carray[$fallback];
+ }
} else{
// if we don't do content convert, still strip the -{}- tags
$disp = $rules;
@@ -621,7 +620,6 @@ class LanguageConverter {
// not in cache, or we need a fresh reload.
// we will first load the default tables
// then update them using things in MediaWiki:Zhconversiontable/*
- global $wgMessageCache;
$this->loadDefaultTables();
foreach($this->mVariants as $var) {
$cached = $this->parseCachedTable($var);