| Index: trunk/tools/mwmultiversion/multiversion/MWVersion.php |
| — | — | @@ -41,9 +41,9 @@ |
| 42 | 42 | define( 'TESTWIKI', 1 ); |
| 43 | 43 | # Test wiki mostly runs off the version of MediaWiki on /home. |
| 44 | 44 | # As horrible hack for NFS-less image scalers, use regular docroot for thumbs? |
| 45 | | - $IP = getHomeMediaWikiDir() . "/$version"; |
| | 45 | + $IP = "/home/wikipedia/common/$version"; |
| 46 | 46 | } else { |
| 47 | | - $IP = getLocalMediaWikiDir() . "/$version"; |
| | 47 | + $IP = "/usr/local/apache/common-local/$version"; |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | chdir( $IP ); |
| — | — | @@ -69,28 +69,18 @@ |
| 70 | 70 | |
| 71 | 71 | require( dirname( __FILE__ ) . '/MWMultiVersion.php' ); |
| 72 | 72 | $multiVersion = MWMultiVersion::initializeForMaintenance(); |
| | 73 | + if ( $multiVersion->getDatabase() === 'testwiki' ) { |
| | 74 | + define( 'TESTWIKI', 1 ); |
| | 75 | + } |
| 73 | 76 | |
| 74 | 77 | # Get the MediaWiki version running on this wiki... |
| 75 | 78 | $version = $multiVersion->getVersion(); |
| 76 | 79 | |
| 77 | 80 | # Get the correct MediaWiki path based on this version... |
| 78 | | - if ( $multiVersion->getDatabase() === 'testwiki' ) { |
| 79 | | - define( 'TESTWIKI', 1 ); |
| 80 | | - $IP = getHomeMediaWikiDir() . "/$version"; |
| 81 | | - } else { |
| 82 | | - $IP = getLocalMediaWikiDir() . "/$version"; |
| 83 | | - } |
| | 81 | + $IP = dirname( __FILE__ ) . "/../$version"; |
| 84 | 82 | |
| 85 | 83 | chdir( $IP ); |
| 86 | 84 | putenv( "MW_INSTALL_PATH=$IP" ); |
| 87 | 85 | |
| 88 | 86 | return "$IP/$file"; |
| 89 | 87 | } |
| 90 | | - |
| 91 | | -function getLocalMediaWikiDir() { |
| 92 | | - return "/usr/local/apache/common"; |
| 93 | | -} |
| 94 | | - |
| 95 | | -function getHomeMediaWikiDir() { |
| 96 | | - return "/home/wikipedia/common"; |
| 97 | | -} |