* German localisation patch by raymond

[lhc/web/wiklou.git] / languages / LanguageConverter.php

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 316bcb1..4c0b562 100644 (file)
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -36,7 +36,6 @@ class LanguageConverter {
                                                                $variantfallbacks=array(),
                                                                $markup=array(),
                                                                $flags = array()) {
-               global $wgLegalTitleChars;
                $this->mLangObj = $langobj;
                $this->mMainLanguageCode = $maincode;
                $this->mVariants = $variants;
@@ -408,10 +407,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 +621,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);