From 269e2535242d5967dc4a293bddf0383a2b8c3b9e Mon Sep 17 00:00:00 2001 From: 3Di Date: Sat, 23 Apr 2016 07:10:59 +0200 Subject: [ticket/14596] Deny installation of Ascraeus under PHP 7 PHPBB3-14596 --- phpBB/install/install_install.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/install/install_install.php') diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 5b818f9475..b57a079f13 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -151,10 +151,10 @@ class install_install extends module 'LEGEND_EXPLAIN' => $lang['PHP_SETTINGS_EXPLAIN'], )); - // Test the minimum PHP version + // Test the minimum and maximum version of PHP $php_version = PHP_VERSION; - if (version_compare($php_version, '5.3.3') < 0) + if ((version_compare($php_version, '5.3.3') < 0) || (version_compare($php_version, '7.0.0-dev', '>='))) { $result = '' . $lang['NO'] . ''; } -- cgit v1.2.1 From 7dc1af25bc2dc0ba59990d53cb7dcdb9c0d48480 Mon Sep 17 00:00:00 2001 From: Jakub Senko Date: Sun, 29 May 2016 17:16:02 +0200 Subject: [ticket/14654] Change Imagemagick to ImageMagick PHPBB3-14654 --- phpBB/install/install_install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/install/install_install.php') diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 5b818f9475..bb3a74ee5e 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -404,7 +404,7 @@ class install_install extends module )); } - // Can we find Imagemagick anywhere on the system? + // Can we find ImageMagick anywhere on the system? $exe = (DIRECTORY_SEPARATOR == '\\') ? '.exe' : ''; $magic_home = getenv('MAGICK_HOME'); -- cgit v1.2.1