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
kigh143 · Jan 22, 2017 · a6eec87 · a6eec87
2 parents 51be789 + 3c30cbd
commit a6eec87
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/phpBB/common.php b/phpBB/common.php
@@ -12,14 +12,19 @@
 */
 
 /**
-* Minimum Requirement: PHP 5.3.9
+* Minimum Requirement: PHP 5.4.0
 */
 
 if (!defined('IN_PHPBB'))
 {
 	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 . 'phpbb/class_loader.' . $phpEx);
 

diff --git a/phpBB/install/app.php b/phpBB/install/app.php
@@ -20,6 +20,11 @@
 $phpbb_root_path = '../';
 $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_path = (file_exists($startup_new_path)) ? $startup_new_path : $phpbb_root_path . 'install/startup.' . $phpEx;
 require($startup_path);