| Index: trunk/phase3/maintenance/doMaintenance.php |
| — | — | @@ -87,6 +87,8 @@ |
| 88 | 88 | // Require the configuration (probably LocalSettings.php) |
| 89 | 89 | require( MWInit::interpretedPath( $maintenance->loadSettings() ) ); |
| 90 | 90 | } |
| | 91 | +// Require the configuration (probably LocalSettings.php) |
| | 92 | +require( $maintenance->loadSettings() ); |
| 91 | 93 | |
| 92 | 94 | if ( $maintenance->getDbType() === Maintenance::DB_ADMIN && |
| 93 | 95 | is_readable( "$IP/AdminSettings.php" ) ) |
| Index: trunk/extensions/WikimediaMaintenance/WikimediaMaintenance.php |
| — | — | @@ -69,6 +69,6 @@ |
| 70 | 70 | define( 'TESTWIKI', 1 ); |
| 71 | 71 | } |
| 72 | 72 | } |
| 73 | | - return '../wmf-config/CommonSettings.php'; |
| | 73 | + return MWInit::interpretedPath( '../wmf-config/CommonSettings.php' ); |
| 74 | 74 | } |
| 75 | 75 | } |