diff options
author | Marc Alexander <admin@m-a-styles.de> | 2019-01-06 20:58:52 +0100 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2019-01-06 20:58:52 +0100 |
commit | 673433dadbc43e3c2edd6bdbd263454371ab4c44 (patch) | |
tree | 792e3e9fd10f4091da3c295316a7552a8a926ade | |
parent | 537ff0c567de293763226390ab9d968ab73d77d5 (diff) | |
parent | a0efae7734dffad160aed7684a3b4072a5dbec69 (diff) | |
download | forums-673433dadbc43e3c2edd6bdbd263454371ab4c44.tar forums-673433dadbc43e3c2edd6bdbd263454371ab4c44.tar.gz forums-673433dadbc43e3c2edd6bdbd263454371ab4c44.tar.bz2 forums-673433dadbc43e3c2edd6bdbd263454371ab4c44.tar.xz forums-673433dadbc43e3c2edd6bdbd263454371ab4c44.zip |
Merge pull request #5498 from 3D-I/ticket/15926
[ticket/15926] Deny 3.2.x installation if PHP >= 7.3-dev
-rw-r--r-- | phpBB/docs/INSTALL.html | 2 | ||||
-rw-r--r-- | phpBB/install/app.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 853607886b..4f7f07d3dc 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -147,7 +147,7 @@ <li>Oracle</li> </ul> </li> - <li><strong>PHP 5.4.7+</strong> with support for the database you intend to use.</li> + <li><strong>PHP 5.4.7+</strong> but less than <strong>PHP 7.3</strong> with support for the database you intend to use.</li> <li>The following PHP modules are required: <ul> <li>json</li> diff --git a/phpBB/install/app.php b/phpBB/install/app.php index ef59689a65..710f49570b 100644 --- a/phpBB/install/app.php +++ b/phpBB/install/app.php @@ -20,9 +20,9 @@ define('PHPBB_ENVIRONMENT', 'production'); $phpbb_root_path = '../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); -if (version_compare(PHP_VERSION, '5.4') < 0) +if (version_compare(PHP_VERSION, '5.4.7', '<') || version_compare(PHP_VERSION, '7.3-dev', '>=')) { - die('You are running an unsupported PHP version. Please upgrade to PHP 5.4.0 or higher before trying to install or update to phpBB 3.2'); + die('You are running an unsupported PHP version. Please upgrade to PHP equal to or greater than 5.4.7 but less than 7.3-dev in order to install or update to phpBB 3.2'); } $startup_new_path = $phpbb_root_path . 'install/update/update/new/install/startup.' . $phpEx; |