Some HipHop fixes:

[lhc/web/wiklou.git] / maintenance / doMaintenance.php

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index 437ca83..d3cf30c 100644 (file)
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -67,19 +67,14 @@ if ( $r ) {
 # Get the MWInit class
 if ( !defined( 'MW_COMPILED' ) ) {
        require_once( "$IP/includes/Init.php" );
+       require_once( "$IP/includes/AutoLoader.php" );
 }
 
-# Setup the profiler
-global $IP;
-if ( !defined( 'MW_COMPILED' ) && file_exists( "$IP/StartProfiler.php" ) ) {
-       require_once( "$IP/StartProfiler.php" );
-} else {
-       require_once( MWInit::compiledPath( 'includes/ProfilerStub.php' ) );
-}
+# Stub the profiler
+require_once( MWInit::compiledPath( 'includes/profiler/Profiler.php' ) );
 
 // Some other requires
 if ( !defined( 'MW_COMPILED' ) ) {
-       require_once( "$IP/includes/AutoLoader.php" );
        require_once( "$IP/includes/Defines.php" );
 }
 require_once( "$IP/includes/DefaultSettings.php" );
@@ -89,8 +84,8 @@ if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
        MWFunction::call( MW_CONFIG_CALLBACK );
 } elseif ( file_exists( "$IP/wmf-config/wikimedia-mode" ) ) {
        // Load settings, using wikimedia-mode if needed
-       // Fixme: replace this hack with general farm-friendly code
-       # TODO FIXME! Wikimedia-specific stuff needs to go away to an ext
+       // @todo FIXME: Replace this hack with general farm-friendly code
+       # @todo FIXME: Wikimedia-specific stuff needs to go away to an ext
        # Maybe a hook?
        global $cluster;
        $wgWikiFarm = true;
@@ -111,7 +106,6 @@ if ( $maintenance->getDbType() === Maintenance::DB_ADMIN &&
 $maintenance->finalSetup();
 // Some last includes
 require_once( MWInit::compiledPath( 'includes/Setup.php' ) );
-require_once( MWInit::compiledPath( 'maintenance/install-utils.inc' ) );
 
 // Much much faster startup than creating a title object
 $wgTitle = null;