| Index: trunk/phase3/maintenance/doMaintenance.php |
| — | — | @@ -58,7 +58,8 @@ |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | // Load settings, using wikimedia-mode if needed |
| 62 | | -if( file_exists( dirname(__FILE__).'/wikimedia-mode' ) ) { |
| | 62 | +// Fixme: replace this hack with general farm-friendly code |
| | 63 | +if( file_exists( "$IP/wmf-config/wikimedia-mode" ) ) { |
| 63 | 64 | # TODO FIXME! Wikimedia-specific stuff needs to go away to an ext |
| 64 | 65 | # Maybe a hook? |
| 65 | 66 | global $cluster; |
| — | — | @@ -66,10 +67,10 @@ |
| 67 | 68 | $cluster = 'pmtpa'; |
| 68 | 69 | require_once( "$IP/includes/AutoLoader.php" ); |
| 69 | 70 | require_once( "$IP/includes/SiteConfiguration.php" ); |
| 70 | | - require( "$IP/wgConf.php" ); |
| | 71 | + require( "$IP/wmf-config/wgConf.php" ); |
| 71 | 72 | $maintenance->loadWikimediaSettings(); |
| 72 | 73 | require( $IP.'/includes/Defines.php' ); |
| 73 | | - require( $IP.'/CommonSettings.php' ); |
| | 74 | + require( $IP.'/wmf-config/CommonSettings.php' ); |
| 74 | 75 | } else { |
| 75 | 76 | require_once( "$IP/includes/AutoLoader.php" ); |
| 76 | 77 | require_once( "$IP/includes/Defines.php" ); |