From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sun, 24 Oct 2004 02:13:00 +0000 (+0000)
Subject: Fixing multiple-inclusion problems
X-Git-Tag: 1.5.0alpha1~1476
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=1aa60b1361bc809e9bb751f539374e672cb1376c;p=lhc%2Fweb%2Fwiklou.git

Fixing multiple-inclusion problems
---

diff --git a/includes/Setup.php b/includes/Setup.php
index 276b0233da..6e41cdee4a 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -232,7 +232,7 @@ function setupLangObj(&$langclass, $langcode) {
 
 	if( ! class_exists( $langclass ) ) {
 		# Default to English/UTF-8
-		require_once( 'languages/LanguageUtf8.php' );
+		require_once( "$IP/languages/LanguageUtf8.php" );
 		$langclass = 'LanguageUtf8';
 	}
 
@@ -243,7 +243,7 @@ function setupLangObj(&$langclass, $langcode) {
 
 	if( $wgUseLatin1 ) {
 		# For non-UTF-8 latin-1 downconversion
-		require_once( 'languages/LanguageLatin1.php' );
+		require_once( "$IP/languages/LanguageLatin1.php" );
 		$xxx = new LanguageLatin1( $lang );
 		unset( $lang );
 		$lang = $xxx;
@@ -251,7 +251,7 @@ function setupLangObj(&$langclass, $langcode) {
 	return $lang;
 }
 
-require_once( 'languages/Language.php' );
+require_once( "$IP/languages/Language.php" );
 
 # $wgLanguageCode may be changed later to fit with user preference.
 # The content language will remain fixed as per the configuration,
@@ -275,7 +275,7 @@ $wgLangClass = 'Language'. str_replace( '-', '_', ucfirst( $wgLanguageCode ) );
 if( $wgLangClass == $wgContLangClass ) {
 	$wgLang = &$wgContLang;
 } else {
-	require_once("languages/$wgLangClass.php");
+	require_once("$IP/languages/$wgLangClass.php");
 	$wgLang = setupLangObj( $wgLangClass, $wgLanguageCode );
 }
 
diff --git a/maintenance/parserTests.php b/maintenance/parserTests.php
index b52e7e5e09..3bf08ca2d8 100644
--- a/maintenance/parserTests.php
+++ b/maintenance/parserTests.php
@@ -29,7 +29,7 @@ $options = array( 'quick', 'color' );
 $optionsWithArgs = array( 'regex' );
 
 require_once( 'commandLine.inc' );
-require_once( 'languages/LanguageUtf8.php' );
+require_once( "$IP/languages/LanguageUtf8.php" );
 
 /** */
 class ParserTest {