Fix NS_PROJECT_TALK (bug #7792)

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

diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index 2bb5389..18a1d71 100644 (file)
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -14,6 +14,15 @@ if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) {
        exit();
 }
 
+if( version_compare( PHP_VERSION, '5.0.0' ) < 0 ) {
+       print "Sorry! This version of MediaWiki requires PHP 5; you are running " .
+               PHP_VERSION . ".\n\n" .
+               "If you are sure you already have PHP 5 installed, it may be " .
+               "installed\n" .
+               "in a different path from PHP 4. Check with your system administrator.\n";
+       die( -1 );
+}
+
 define('MEDIAWIKI',true);
 
 # Process command line arguments
@@ -28,16 +37,15 @@ if ( !isset( $optionsWithArgs ) ) {
 $optionsWithArgs[] = 'conf'; # For specifying the location of LocalSettings.php
 
 $self = array_shift( $argv );
-$self = __FILE__;
-$IP = realpath( dirname( $self ) . '/..' );
+$IP = realpath( dirname( __FILE__ ) . '/..' );
 #chdir( $IP );
+require_once( "$IP/StartProfiler.php" );
 
 $options = array();
 $args = array();
 
 
 # Parse arguments
-
 for( $arg = reset( $argv ); $arg !== false; $arg = next( $argv ) ) {
        if ( $arg == '--' ) {
                # End of options, remainder should be considered arguments
@@ -133,6 +141,7 @@ if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
        # This is for the IRC scripts, which now run as the apache user
        # The apache user doesn't have access to the wikiadmin_pass command
        if ( $_ENV['USER'] == 'apache' ) {
+       #if ( posix_geteuid() == 48 ) {
                $wgUseNormalUser = true;
        }
 
@@ -141,7 +150,7 @@ if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
        $DP = $IP;
        ini_set( 'include_path', ".:$IP:$IP/includes:$IP/languages:$IP/maintenance" );
 
-       require_once( $IP.'/includes/ProfilerStub.php' );
+       #require_once( $IP.'/includes/ProfilerStub.php' );
        require_once( $IP.'/includes/Defines.php' );
        require_once( $IP.'/CommonSettings.php' );
 
@@ -168,7 +177,7 @@ if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
        }
        $wgCommandLineMode = true;
        $DP = $IP;
-       require_once( $IP.'/includes/ProfilerStub.php' );
+       #require_once( $IP.'/includes/ProfilerStub.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" );
@@ -179,7 +188,9 @@ if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
 }
 
 # Turn off output buffering again, it might have been turned on in the settings files
-@ob_end_flush();
+if( ob_get_level() ) {
+       ob_end_flush();
+}
 # Same with these
 $wgCommandLineMode = true;
 
@@ -202,9 +213,11 @@ if ( defined( 'MW_CMDLINE_CALLBACK' ) ) {
 
 ini_set( 'memory_limit', -1 );
 
+$wgShowSQLErrors = true;
+
 require_once( 'Setup.php' );
 require_once( 'install-utils.inc' );
-$wgTitle = Title::newFromText( 'Command line script' );
+$wgTitle = null; # Much much faster startup than creating a title object
 set_time_limit(0);
 
 // --------------------------------------------------------------------