diff options
Diffstat (limited to 'maintenance/commandLine.inc')
| -rw-r--r-- | maintenance/commandLine.inc | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc index a23bb6eb..e83a1916 100644 --- a/maintenance/commandLine.inc +++ b/maintenance/commandLine.inc @@ -40,9 +40,9 @@ $optionsWithArgs[] = 'aconf'; # As above for AdminSettings.php $optionsWithArgs[] = 'wiki'; # For specifying the wiki ID $self = array_shift( $argv ); -$IP = ( getenv('MW_INSTALL_PATH') !== false +$IP = strval( getenv('MW_INSTALL_PATH') ) !== '' ? getenv('MW_INSTALL_PATH') - : realpath( dirname( __FILE__ ) . '/..' ) ); + : realpath( dirname( __FILE__ ) . '/..' ); #chdir( $IP ); require_once( "$IP/StartProfiler.php" ); @@ -112,9 +112,8 @@ if (!isset( $wgUseNormalUser ) ) { $wgUseNormalUser = false; } -if ( file_exists( '/home/wikipedia/common/langlist' ) ) { +if ( file_exists( dirname(__FILE__).'/wikimedia-mode' ) ) { $wgWikiFarm = true; - #$cluster = trim( file_get_contents( '/etc/cluster' ) ); $cluster = 'pmtpa'; require_once( "$IP/includes/AutoLoader.php" ); require_once( "$IP/includes/SiteConfiguration.php" ); @@ -166,16 +165,10 @@ if ( file_exists( '/home/wikipedia/common/langlist' ) ) { } #require_once( $IP.'/includes/ProfilerStub.php' ); - require_once( $IP.'/includes/Defines.php' ); - require_once( $IP.'/CommonSettings.php' ); - - $bin = '/home/wikipedia/bin'; - if ( $wgUseRootUser ) { - $wgDBuser = $wgDBadminuser = 'root'; - $wgDBpassword = $wgDBadminpassword = trim(`$bin/mysql_root_pass`); - } elseif ( !$wgUseNormalUser ) { - $wgDBuser = $wgDBadminuser = 'wikiadmin'; - $wgDBpassword = $wgDBadminpassword = trim(`$bin/wikiadmin_pass`); + require( $IP.'/includes/Defines.php' ); + require( $IP.'/CommonSettings.php' ); + if ( !$wgUseNormalUser ) { + require( $IP.'/AdminSettings.php' ); } } else { $wgWikiFarm = false; @@ -264,3 +257,5 @@ require_once( "$IP/includes/Setup.php" ); require_once( "$IP/install-utils.inc" ); $wgTitle = null; # Much much faster startup than creating a title object @set_time_limit(0); + +$wgProfiling = false; // only for Profiler.php mode; avoids OOM errors |