(bug 9058) Introduce '--aconf' option for all maintenance scripts, to provide a path...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2c02dd3..4cca7f4 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -70,6 +70,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 5908) Add "DEFAULTSORTKEY" and "DEFAULTCATEGORYSORT" aliases for
   "DEFAULTSORT" magic word
 * (bug 10181) Support the XCache object caching mechanism
+* (bug 9058) Introduce '--aconf' option for all maintenance scripts, to provide
+  a path to the AdminSettings.php file
 
 == Bugfixes since 1.10 ==
 

diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index bff9171..4466344 100644 (file)
--- 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__ ) . '/..' );
@@ -181,9 +182,12 @@ if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
        require_once( $settingsFile );
        /* ini_set( 'include_path', ".$sep$IP$sep$IP/includes$sep$IP/languages$sep$IP/maintenance" ); */
 
-       if ( is_readable( $IP.'/AdminSettings.php' ) ) {
-               require_once( $IP.'/AdminSettings.php' );
-       }
+       $adminSettings = isset( $options['aconf'] )
+               ? $options['aconf']
+               : "{$IP}/AdminSettings.php";
+       if( is_readable( $adminSettings ) )
+               require_once( $adminSettings );
+
 }
 
 # Turn off output buffering again, it might have been turned on in the settings files