diff options
| author | Wesley Fok <wesley.fok@yp.ca> | 2016-08-03 13:20:42 -0400 |
|---|---|---|
| committer | Wesley Fok <wesley.fok@yp.ca> | 2016-08-03 13:20:42 -0400 |
| commit | ba13832085bf05eb5ab19aeb9681b16c7a119df9 (patch) | |
| tree | 7fb014aeb08e614fe060dfeede0ea05885ff4d7d /phpBB/install | |
| parent | 2081a7809540db661193be376c1220a2c21acff4 (diff) | |
| parent | f68820762b2d78bc26c59724a3dd98091bb3379b (diff) | |
| download | forums-ba13832085bf05eb5ab19aeb9681b16c7a119df9.tar forums-ba13832085bf05eb5ab19aeb9681b16c7a119df9.tar.gz forums-ba13832085bf05eb5ab19aeb9681b16c7a119df9.tar.bz2 forums-ba13832085bf05eb5ab19aeb9681b16c7a119df9.tar.xz forums-ba13832085bf05eb5ab19aeb9681b16c7a119df9.zip | |
Merge remote-tracking branch 'upstream/3.1.x' into ticket/14638-3.1.x
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/install_install.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 5b818f9475..8e57ed3edd 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 = '<strong style="color:red">' . $lang['NO'] . '</strong>'; } @@ -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'); |