From a0711d669b760e0b1e67b25b047a4a220f985c5a Mon Sep 17 00:00:00 2001 From: withoutaname Date: Sat, 19 Jul 2014 22:13:17 -0700 Subject: [PATCH] Remove check for PHP version in install.php It's redundant to the check already done in Maintenance.php Change-Id: I525dc8ac5a9872b82209b1a94bb306568dc0901b --- maintenance/install.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/maintenance/install.php b/maintenance/install.php index 3b2945225c..47114fd6cd 100644 --- a/maintenance/install.php +++ b/maintenance/install.php @@ -21,16 +21,13 @@ * @ingroup Maintenance */ -if ( !function_exists( 'version_compare' ) || ( version_compare( PHP_VERSION, '5.3.2' ) < 0 ) ) { - require_once dirname( __FILE__ ) . '/../includes/PHPVersionError.php'; - wfPHPVersionError( 'cli' ); -} +// Checking for old versions of PHP is done in Maintenance.php +// We need to use dirname( __FILE__ ) here cause __DIR__ is PHP5.3+ +require_once dirname( __FILE__ ) . '/Maintenance.php'; define( 'MW_CONFIG_CALLBACK', 'Installer::overrideConfig' ); define( 'MEDIAWIKI_INSTALL', true ); -require_once dirname( __DIR__ ) . '/maintenance/Maintenance.php'; - /** * Maintenance script to install and configure MediaWiki * -- 2.20.1