More useful debug output

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

diff --git a/includes/WebStart.php b/includes/WebStart.php
index 557fa74..4060c55 100644 (file)
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -97,6 +97,7 @@ if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
        require_once( "$IP/includes/DefaultSettings.php" );
 
        $callback = MW_CONFIG_CALLBACK;
+       # PHP 5.1 doesn't support "class::method" for call_user_func, so split it
        if ( strpos( $callback, '::' ) !== false ) {
                $callback = explode( '::', $callback, 2);
        }
@@ -114,6 +115,11 @@ if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
        # Include site settings. $IP may be changed (hopefully before the AutoLoader is invoked)
        require_once( "$IP/LocalSettings.php" );
 }
+
+if ( $wgEnableSelenium ) {
+       require_once( "$IP/includes/SeleniumWebSettings.php" );
+}
+
 wfProfileOut( 'WebStart.php-conf' );
 
 wfProfileIn( 'WebStart.php-ob_start' );
@@ -135,3 +141,4 @@ wfProfileOut( 'WebStart.php-ob_start' );
 if ( !defined( 'MW_NO_SETUP' ) ) {
        require_once( "$IP/includes/Setup.php" );
 }
+