r87643 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r87642‎ | r87643 | r87644 >
Date:15:37, 7 May 2011
Author:happy-melon
Status:reverted
Tags:
Comment:
Follow-up r87637: the terrors of copy-and-paste.
Modified paths:
  • /trunk/phase3/maintenance/Maintenance.php (modified) (history)
  • /trunk/phase3/maintenance/install.php (modified) (history)
  • /trunk/phase3/maintenance/update.php (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/update.php
@@ -26,7 +26,7 @@
2727 */
2828
2929 // Include global constants, including MW_VERSION and MW_MIN_PHP_VERSION
30 -require_once( dirname( __FILE__ ) . '/includes/Defines.php' );
 30+require_once( dirname( dirname( __FILE__ ) ) . '/includes/Defines.php' );
3131
3232 if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), MW_MIN_PHP_VERSION ) < 0 ) ) {
3333 echo "You are using PHP version " . phpversion() . " but MediaWiki needs PHP " .
Index: trunk/phase3/maintenance/install.php
@@ -21,7 +21,7 @@
2222 */
2323
2424 // Include global constants, including MW_VERSION and MW_MIN_PHP_VERSION
25 -require_once( dirname( __FILE__ ) . '/includes/Defines.php' );
 25+require_once( dirname( dirname( __FILE__ ) ) . '/includes/Defines.php' );
2626
2727 if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), MW_MIN_PHP_VERSION ) < 0 ) ) {
2828 echo "You are using PHP version " . phpversion() . " but MediaWiki needs PHP " .
Index: trunk/phase3/maintenance/Maintenance.php
@@ -21,7 +21,7 @@
2222 */
2323
2424 // Include global constants, including MW_VERSION and MW_MIN_PHP_VERSION
25 -require_once( dirname( __FILE__ ) . '/includes/Defines.php' );
 25+require_once( dirname( dirname( __FILE__ ) ) . '/includes/Defines.php' );
2626
2727 // Define this so scripts can easily find doMaintenance.php
2828 define( 'RUN_MAINTENANCE_IF_MAIN', dirname( __FILE__ ) . '/doMaintenance.php' );

Follow-up revisions

RevisionCommit summaryAuthorDate
r88176Revert r87635, r87637, r87639, r87643 (MW_MIN_PHP_VERSION etc.): breaks HipHo...tstarling13:21, 15 May 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r87637Centralise the minimum-required-php-version in a MW_MIN_PHP_VERSION constant ...happy-melon15:16, 7 May 2011

Status & tagging log