From b1585c79420fddb3984de32ff10d3b2a21e9a1a3 Mon Sep 17 00:00:00 2001 From: Daniel Friesen Date: Wed, 14 May 2008 11:17:54 +0000 Subject: [PATCH] Revert 34558/34588. Use of an absolute path specified by __FILE__ breaks anyone using the symlink style of installation and relies on the assumption that the MediaWiki code is always located a directory above the LocalSettings.php file (Even Wikia doesn't follow this) --- includes/WebStart.php | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/includes/WebStart.php b/includes/WebStart.php index 1a6d1bebe2..189c0161d1 100644 --- a/includes/WebStart.php +++ b/includes/WebStart.php @@ -66,25 +66,24 @@ unset( $IP ); define( 'MEDIAWIKI', true ); # Start profiler -$preIP = dirname( __FILE__ ) . '/..'; -require_once( "$preIP/StartProfiler.php" ); +require_once( './StartProfiler.php' ); wfProfileIn( 'WebStart.php-conf' ); # Load up some global defines. -require_once( "$preIP/includes/Defines.php" ); +require_once( './includes/Defines.php' ); # LocalSettings.php is the per site customization file. If it does not exit # the wiki installer need to be launched or the generated file moved from # ./config/ to ./ -if( !file_exists( "$preIP/LocalSettings.php" ) ) { - $IP = $preIP; - require_once( "$preIP/includes/DefaultSettings.php" ); # used for printing the version - require_once( "$preIP/includes/templates/NoLocalSettings.php" ); +if( !file_exists( './LocalSettings.php' ) ) { + $IP = '.'; + require_once( './includes/DefaultSettings.php' ); # used for printing the version + require_once( './includes/templates/NoLocalSettings.php' ); die(); } # Include this site setttings -require_once( "$preIP/LocalSettings.php" ); // $IP available after this +require_once( './LocalSettings.php' ); wfProfileOut( 'WebStart.php-conf' ); wfProfileIn( 'WebStart.php-ob_start' ); @@ -93,12 +92,12 @@ if ( ob_get_level() ) { # Someone's been mixing configuration data with code! # How annoying. } elseif ( !defined( 'MW_NO_OUTPUT_BUFFER' ) ) { - require_once( "$IP/includes/OutputHandler.php" ); + require_once( './includes/OutputHandler.php' ); ob_start( 'wfOutputHandler' ); } wfProfileOut( 'WebStart.php-ob_start' ); if ( !defined( 'MW_NO_SETUP' ) ) { - require_once( "$IP/includes/Setup.php" ); + require_once( './includes/Setup.php' ); } -- 2.20.1