Merge branch '3.2.x'

* 3.2.x:
  [ticket/11076] Also state min PHP version when visiting forum website
  [ticket/11076] Also add notice about unsupported version to installer
This commit is contained in:
Tristan Darricau 2017-01-22 23:35:40 +01:00
commit a6eec874af
No known key found for this signature in database
GPG key ID: 817043C2E29DB881
2 changed files with 11 additions and 1 deletions

View file

@ -12,7 +12,7 @@
*/ */
/** /**
* Minimum Requirement: PHP 5.3.9 * Minimum Requirement: PHP 5.4.0
*/ */
if (!defined('IN_PHPBB')) if (!defined('IN_PHPBB'))
@ -20,6 +20,11 @@ if (!defined('IN_PHPBB'))
exit; exit;
} }
if (version_compare(PHP_VERSION, '5.4') < 0)
{
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');
}
require($phpbb_root_path . 'includes/startup.' . $phpEx); require($phpbb_root_path . 'includes/startup.' . $phpEx);
require($phpbb_root_path . 'phpbb/class_loader.' . $phpEx); require($phpbb_root_path . 'phpbb/class_loader.' . $phpEx);

View file

@ -20,6 +20,11 @@ define('PHPBB_ENVIRONMENT', 'production');
$phpbb_root_path = '../'; $phpbb_root_path = '../';
$phpEx = substr(strrchr(__FILE__, '.'), 1); $phpEx = substr(strrchr(__FILE__, '.'), 1);
if (version_compare(PHP_VERSION, '5.4') < 0)
{
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');
}
$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;
$startup_path = (file_exists($startup_new_path)) ? $startup_new_path : $phpbb_root_path . 'install/startup.' . $phpEx; $startup_path = (file_exists($startup_new_path)) ? $startup_new_path : $phpbb_root_path . 'install/startup.' . $phpEx;
require($startup_path); require($startup_path);