summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@users.mediawiki.org>2006-07-09 05:44:06 +0000
committerBrion Vibber <brion@users.mediawiki.org>2006-07-09 05:44:06 +0000
commit5f4988e6dc904c9ed95be4b693e7eb78219bdd20 (patch)
tree1881b5f2f5656d354cd4ff82b0e79f18eb979291
parent6ae6773c1310a1066b7895229a175e5d9db5c3a4 (diff)
* Installer now shows clear error message about old PHP versions1.7.1
rather than a confusing parse error
Notes
http://mediawiki.org/wiki/Special:Code/MediaWiki/15469
-rw-r--r--RELEASE-NOTES2
-rw-r--r--config/index.php7
2 files changed, 8 insertions, 1 deletions
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 07687c5a8963..7378b5dfaf41 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -20,6 +20,8 @@ if it's not being used.
* Fix for 'emailconfirmed' implicit user group
* Fix for upgrades on some versions of MySQL 4.0.x
* Fixed potential XSS in profileinfo.php
+* Installer now shows clear error message about old PHP versions
+ rather than a confusing parse error
== MediaWiki 1.7.0 ==
diff --git a/config/index.php b/config/index.php
index fef48efad6aa..8fc91f8ec13a 100644
--- 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" );
@@ -197,7 +203,6 @@ if( !is_writable( "." ) ) {
}
-require_once( "install-utils.inc" );
require_once( "maintenance/updaters.inc" );
class ConfigData {