Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2022-07-16 18:49:13 -04:00
commit 9c3d27d267
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 2 additions and 2 deletions

View file

@ -27,7 +27,7 @@ error_reporting($level);
*/ */
if (version_compare(PHP_VERSION, '7.3.0', '<')) if (version_compare(PHP_VERSION, '7.3.0', '<'))
{ {
die('You are running an unsupported PHP version. Please upgrade to PHP 7.3.0 or higher before trying to install or update to phpBB 4.0'); die('You are running an unsupported PHP version (' . PHP_VERSION . '). Please upgrade to PHP 7.3.0 or higher before trying to install or update to phpBB 4.0');
} }
// In PHP 5.3.0 the error level has been raised to E_WARNING which causes problems // In PHP 5.3.0 the error level has been raised to E_WARNING which causes problems

View file

@ -22,7 +22,7 @@ $phpEx = substr(strrchr(__FILE__, '.'), 1);
if (version_compare(PHP_VERSION, '7.1.3', '<')) if (version_compare(PHP_VERSION, '7.1.3', '<'))
{ {
die('You are running an unsupported PHP version. Please upgrade to PHP 7.1.3 or higher before trying to install or update to phpBB 3.3'); die('You are running an unsupported PHP version (' . PHP_VERSION . '). Please upgrade to PHP 7.1.3 or higher before trying to install or update to phpBB 3.3');
} }
$startup_new_path = $phpbb_root_path . 'install/update/update/new/install/startup.' . $phpEx; $startup_new_path = $phpbb_root_path . 'install/update/update/new/install/startup.' . $phpEx;