Clean up code now that the old path is gone

[lhc/web/wiklou.git] / includes / WebStart.php

diff --git a/includes/WebStart.php b/includes/WebStart.php
index edc58cb..6254ed9 100644 (file)
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -8,7 +8,7 @@
 # This must be done before any globals are set by the code
 if ( ini_get( 'register_globals' ) ) {
        if ( isset( $_REQUEST['GLOBALS'] ) ) {
-               die( '<a href="http://www.hardened-php.net/index.76.html">$GLOBALS overwrite vulnerability</a>');
+               die( '<a href="http://www.hardened-php.net/globals-problem">$GLOBALS overwrite vulnerability</a>');
        }
        $verboten = array(
                'GLOBALS',
@@ -46,7 +46,6 @@ if ( function_exists ( 'getrusage' ) ) {
        $wgRUstart = array();
 }
 unset( $IP );
-@ini_set( 'allow_url_fopen', 0 ); # For security
 
 # Valid web server entry point, enable includes.
 # Please don't move this line to includes/Defines.php. This line essentially
@@ -66,7 +65,11 @@ if ( $IP === false ) {
 
 
 # Start profiler
-require_once( "$IP/StartProfiler.php" );
+if( file_exists("$IP/StartProfiler.php") ) {
+       require_once( "$IP/StartProfiler.php" );
+} else {
+       require_once( "$IP/includes/ProfilerStub.php" );
+}
 wfProfileIn( 'WebStart.php-conf' );
 
 # Load up some global defines.
@@ -98,7 +101,12 @@ require_once( "$IP/includes/AutoLoader.php" );
 if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
        # Use a callback function to configure MediaWiki
        require_once( "$IP/includes/DefaultSettings.php" );
-       call_user_func( MW_CONFIG_CALLBACK );
+
+       $callback = MW_CONFIG_CALLBACK;
+       if ( strpos( $callback, '::' ) !== false ) {
+               $callback = explode( '::', $callback, 2);
+       }
+       call_user_func( $callback );
 } else {
        # 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