diff options
Diffstat (limited to 'maintenance/commandLine.inc')
| -rw-r--r-- | maintenance/commandLine.inc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc index 3bf7f1b2..4466344f 100644 --- a/maintenance/commandLine.inc +++ b/maintenance/commandLine.inc @@ -34,6 +34,7 @@ if ( !isset( $optionsWithArgs ) ) { $optionsWithArgs = array(); } $optionsWithArgs[] = 'conf'; # For specifying the location of LocalSettings.php +$optionsWithArgs[] = 'aconf'; # As above for AdminSettings.php $self = array_shift( $argv ); $IP = realpath( dirname( __FILE__ ) . '/..' ); @@ -179,11 +180,14 @@ if ( file_exists( '/home/wikipedia/common/langlist' ) ) { #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" ); + /* ini_set( 'include_path', ".$sep$IP$sep$IP/includes$sep$IP/languages$sep$IP/maintenance" ); */ + + $adminSettings = isset( $options['aconf'] ) + ? $options['aconf'] + : "{$IP}/AdminSettings.php"; + if( is_readable( $adminSettings ) ) + require_once( $adminSettings ); - if ( is_readable( $IP.'/AdminSettings.php' ) ) { - require_once( $IP.'/AdminSettings.php' ); - } } # Turn off output buffering again, it might have been turned on in the settings files @@ -214,8 +218,8 @@ ini_set( 'memory_limit', -1 ); $wgShowSQLErrors = true; -require_once( 'Setup.php' ); -require_once( 'install-utils.inc' ); +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); |