Changeset:
92a8e3e94cf5
https://sourceforge.net/p/mrbs/hg-code/ci/92a8e3e94cf5a2aaf90d07831ac7e0f40ba09cdc
Author:
Campbell Morrison <[email protected]>
Date:
Tue Nov 17 15:50:35 2015 +0000
Log message:
Moved the PHP version check to happen earlier, otherwise MRBS will fail with
obscure error messages if the PHP version is too low. See SF Bugs #337.
diffstat:
web/defaultincludes.inc | 7 +++++++
web/internalconfig.inc.php | 7 -------
2 files changed, 7 insertions(+), 7 deletions(-)
diffs (34 lines):
diff -r dbc0e7ea98f7 -r 92a8e3e94cf5 web/defaultincludes.inc
--- a/web/defaultincludes.inc Sat Nov 14 16:57:15 2015 +0000
+++ b/web/defaultincludes.inc Tue Nov 17 15:50:35 2015 +0000
@@ -2,6 +2,13 @@
// $Id$
+// Check PHP version
+$min_PHP_version = '5.3.3';
+if (!function_exists('version_compare') || version_compare(PHP_VERSION,
$min_PHP_version) < 0)
+{
+ die("MRBS requires PHP $min_PHP_version or above. This server is running
version " . PHP_VERSION . ".");
+}
+
// We use require for some files rather than require_once because the values
that
// are assigned to variables will change depending on the context in which the
file
// is called.
diff -r dbc0e7ea98f7 -r 92a8e3e94cf5 web/internalconfig.inc.php
--- a/web/internalconfig.inc.php Sat Nov 14 16:57:15 2015 +0000
+++ b/web/internalconfig.inc.php Tue Nov 17 15:50:35 2015 +0000
@@ -134,13 +134,6 @@
* Checking
********************************************************/
-// Check PHP version
-$min_PHP_version = '5.3.3';
-if (!function_exists('version_compare') || version_compare(PHP_VERSION,
$min_PHP_version) < 0)
-{
- die("MRBS requires PHP $min_PHP_version or above. This server is running
version " . PHP_VERSION . ".");
-}
-
// Do some consistency checking of user settings from config.inc.php
if ($enable_periods)
{
------------------------------------------------------------------------------
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
