* (bug 7545) Fix PHP version check on install

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 92b9e42..104bb17 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -32,6 +32,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   screen sizes, for the default monobook skin.
 * Fix PHP notice and estimates for dumpBackup.php and friends
 * Improved register_globals paranoia checks
+* (bug 7545) Fix PHP version check on install
 
 
 == Languages updated ==

diff --git a/config/index.php b/config/index.php
index c74d2bd..5443614 100644 (file)
--- a/config/index.php
+++ b/config/index.php
@@ -37,6 +37,12 @@ if( !ini_set( "include_path", ".$sep$IP$sep$IP/includes$sep$IP/languages" ) ) {
 # Define an entry point and include some files
 define( "MEDIAWIKI", true );
 define( "MEDIAWIKI_INSTALL", true );
+
+// Run version checks before including other files
+// so people don't see a scary parse error.
+require_once( "install-utils.inc" );
+install_version_checks();
+
 require_once( "includes/Defines.php" );
 require_once( "includes/DefaultSettings.php" );
 require_once( "includes/MagicWord.php" );