redact exception traces and abstract getTrace

[lhc/web/wiklou.git] / load.php

diff --git a/load.php b/load.php
index 6ffc145..1790f48 100644 (file)
--- a/load.php
+++ b/load.php
@@ -24,15 +24,12 @@
 
 // Bail if PHP is too low
 if ( !function_exists( 'version_compare' ) || version_compare( phpversion(), '5.3.2' ) < 0 ) {
-       require( dirname( __FILE__ ) . '/includes/PHPVersionError.php' );
+       // We need to use dirname( __FILE__ ) here cause __DIR__ is PHP5.3+
+       require dirname( __FILE__ ) . '/includes/PHPVersionError.php';
        wfPHPVersionError( 'load.php' );
 }
 
-if ( isset( $_SERVER['MW_COMPILED'] ) ) {
-       require ( 'phase3/includes/WebStart.php' );
-} else {
-       require ( __DIR__ . '/includes/WebStart.php' );
-}
+require __DIR__ . '/includes/WebStart.php';
 
 wfProfileIn( 'load.php' );