From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sat, 23 Oct 2004 10:23:05 +0000 (+0000)
Subject: Fixed bug due to non-global scope when included from Setup.php
X-Git-Tag: 1.5.0alpha1~1486
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=94a1c9e15933d067b7c4f2e346a9aa698673cdcf;p=lhc%2Fweb%2Fwiklou.git

Fixed bug due to non-global scope when included from Setup.php
---

diff --git a/languages/LanguageLatin1.php b/languages/LanguageLatin1.php
index d66d2153dc..c0f4cc31c1 100644
--- a/languages/LanguageLatin1.php
+++ b/languages/LanguageLatin1.php
@@ -26,7 +26,10 @@
 # This will replace anything that can't be described in Latin-1 with
 # an ugly question mark (?) so don't use this mode on languages that
 # aren't suited to it!
-#
+
+# This file and LanguageUtf8.php may be included from within functions, so
+# we need to have global statements
+global $wgInputEncoding, $wgOutputEncoding, 
 
 $wgInputEncoding = "ISO-8859-1";
 $wgOutputEncoding = "ISO-8859-1";
diff --git a/languages/LanguageUtf8.php b/languages/LanguageUtf8.php
index 698efce716..4bd1f66849 100644
--- a/languages/LanguageUtf8.php
+++ b/languages/LanguageUtf8.php
@@ -2,6 +2,12 @@
 #$Id$
 if( defined( "MEDIAWIKI" ) ) {
 
+# This file and LanguageLatin1.php may be included from within functions, so
+# we need to have global statements
+
+global $wgInputEncoding, $wgOutputEncoding, $wikiUpperChars, $wikiLowerChars;
+global $wgDBname, $wgMemc;
+
 $wgInputEncoding    = "UTF-8";
 $wgOutputEncoding	= "UTF-8";