Localisation updates for core messages from translatewiki.net (2009-09-03 16:52 UTC)

[lhc/web/wiklou.git] / maintenance / commandLine.inc

diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index e83a191..15a37c8 100644 (file)
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -44,7 +44,11 @@ $IP = strval( getenv('MW_INSTALL_PATH') ) !== ''
        ? getenv('MW_INSTALL_PATH')
        : realpath( dirname( __FILE__ ) . '/..' );
 #chdir( $IP );
-require_once( "$IP/StartProfiler.php" );
+if ( file_exists( "$IP/StartProfiler.php" ) ) {
+       require_once( "$IP/StartProfiler.php" );
+} else {
+       require_once( "$IP/includes/ProfilerStub.php" );
+}
 
 $options = array();
 $args = array();
@@ -167,8 +171,8 @@ if ( file_exists( dirname(__FILE__).'/wikimedia-mode' ) ) {
        #require_once( $IP.'/includes/ProfilerStub.php' );
        require( $IP.'/includes/Defines.php' );
        require( $IP.'/CommonSettings.php' );
-       if ( !$wgUseNormalUser ) {
-               require( $IP.'/AdminSettings.php' );
+       if ( !$wgUseNormalUser && is_readable( "$IP/AdminSettings.php" ) ) {
+               require( "$IP/AdminSettings.php" );
        }
 } else {
        $wgWikiFarm = false;
@@ -194,8 +198,7 @@ if ( file_exists( dirname(__FILE__).'/wikimedia-mode' ) ) {
        $wgCommandLineMode = true;
        $DP = $IP;
        require_once( "$IP/includes/AutoLoader.php" );
-       #require_once( $IP.'/includes/ProfilerStub.php' );
-       require_once( $IP.'/includes/Defines.php' );
+       require_once( "$IP/includes/Defines.php" );
        require_once( $settingsFile );
        /* ini_set( 'include_path', ".$sep$IP$sep$IP/includes$sep$IP/languages$sep$IP/maintenance" ); */
 
@@ -254,7 +257,7 @@ if( version_compare( phpversion(), '5.2.4' ) >= 0 ) {
 $wgShowSQLErrors = true;
 
 require_once( "$IP/includes/Setup.php" );
-require_once( "$IP/install-utils.inc" );
+require_once( "$IP/maintenance/install-utils.inc" );
 $wgTitle = null; # Much much faster startup than creating a title object
 @set_time_limit(0);