r111716 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r111715‎ | r111716 | r111717 >
Date:02:01, 17 February 2012
Author:aaron
Status:ok
Tags:
Comment:
Moved more constants do defines.php
Modified paths:
  • /trunk/tools/mwmultiversion/multiversion/MWVersion.php (modified) (history)
  • /trunk/tools/mwmultiversion/multiversion/defines.php (modified) (history)

Diff [purge]

Index: trunk/tools/mwmultiversion/multiversion/MWVersion.php
@@ -34,7 +34,7 @@
3535 # Wiki doesn't exist yet?
3636 if ( $multiVersion->isMissing() ) {
3737 header( "Cache-control: no-cache" ); // same hack as CommonSettings.php
38 - include( "/usr/local/apache/common-local/wmf-config/missing.php" );
 38+ include( MULTIVER_404SCRIPT_PATH_APACHE );
3939 exit;
4040 }
4141
@@ -52,9 +52,9 @@
5353 define( 'TESTWIKI', 1 );
5454 # Test wiki mostly runs off the version of MediaWiki on /home.
5555 # As horrible hack for NFS-less image scalers, use regular docroot for thumbs?
56 - $IP = "/home/wikipedia/common/$version";
 56+ $IP = MULTIVER_COMMON_HOME . "/$version";
5757 } else {
58 - $IP = "/usr/local/apache/common-local/$version";
 58+ $IP = MULTIVER_COMMON_APACHE . "/$version";
5959 }
6060
6161 chdir( $IP );
Index: trunk/tools/mwmultiversion/multiversion/defines.php
@@ -2,5 +2,11 @@
33 /**
44 * Define installation specific MWMultiVersion values like paths
55 */
 6+define( 'MULTIVER_COMMON_HOME', '/home/wikipedia/common' );
 7+define( 'MULTIVER_COMMON_APACHE', '/usr/local/apache/common-local' );
 8+
69 define( 'MULTIVER_CDB_DIR_HOME', '/home/wikipedia/common' );
710 define( 'MULTIVER_CDB_DIR_APACHE', '/usr/local/apache/common-local' );
 11+
 12+define( 'MULTIVER_404SCRIPT_PATH_HOME', '/home/wikipedia/common/wmf-config/missing.php' );
 13+define( 'MULTIVER_404SCRIPT_PATH_APACHE', '/usr/local/apache/common-local/wmf-config/missing.php' );

Status & tagging log