| Index: trunk/phase3/maintenance/commandLine.inc |
| — | — | @@ -34,6 +34,7 @@ |
| 35 | 35 | $optionsWithArgs = array(); |
| 36 | 36 | } |
| 37 | 37 | $optionsWithArgs[] = 'conf'; # For specifying the location of LocalSettings.php |
| | 38 | +$optionsWithArgs[] = 'aconf'; # As above for AdminSettings.php |
| 38 | 39 | |
| 39 | 40 | $self = array_shift( $argv ); |
| 40 | 41 | $IP = realpath( dirname( __FILE__ ) . '/..' ); |
| — | — | @@ -181,9 +182,12 @@ |
| 182 | 183 | require_once( $settingsFile ); |
| 183 | 184 | /* ini_set( 'include_path', ".$sep$IP$sep$IP/includes$sep$IP/languages$sep$IP/maintenance" ); */ |
| 184 | 185 | |
| 185 | | - if ( is_readable( $IP.'/AdminSettings.php' ) ) { |
| 186 | | - require_once( $IP.'/AdminSettings.php' ); |
| 187 | | - } |
| | 186 | + $adminSettings = isset( $options['aconf'] ) |
| | 187 | + ? $options['aconf'] |
| | 188 | + : "{$IP}/AdminSettings.php"; |
| | 189 | + if( is_readable( $adminSettings ) ) |
| | 190 | + require_once( $adminSettings ); |
| | 191 | + |
| 188 | 192 | } |
| 189 | 193 | |
| 190 | 194 | # Turn off output buffering again, it might have been turned on in the settings files |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -70,6 +70,8 @@ |
| 71 | 71 | * (bug 5908) Add "DEFAULTSORTKEY" and "DEFAULTCATEGORYSORT" aliases for |
| 72 | 72 | "DEFAULTSORT" magic word |
| 73 | 73 | * (bug 10181) Support the XCache object caching mechanism |
| | 74 | +* (bug 9058) Introduce '--aconf' option for all maintenance scripts, to provide |
| | 75 | + a path to the AdminSettings.php file |
| 74 | 76 | |
| 75 | 77 | == Bugfixes since 1.10 == |
| 76 | 78 | |