diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-07-31 15:18:35 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-07-31 15:18:35 +0200 |
| commit | 4ac2547d6234dc7fcc1f34d645de904f08089896 (patch) | |
| tree | 6ec1d7333354d659579dc70603750963903bb761 /phpBB | |
| parent | 55223e6840e453c49f3a8bcd44d193aa91f57bf2 (diff) | |
| parent | 0026ed02aec0f670a67a495c52f52255e4d685be (diff) | |
| download | forums-4ac2547d6234dc7fcc1f34d645de904f08089896.tar forums-4ac2547d6234dc7fcc1f34d645de904f08089896.tar.gz forums-4ac2547d6234dc7fcc1f34d645de904f08089896.tar.bz2 forums-4ac2547d6234dc7fcc1f34d645de904f08089896.tar.xz forums-4ac2547d6234dc7fcc1f34d645de904f08089896.zip | |
Merge pull request #4301 from 3D-I/PHPBB3-14596
[ticket/14596] Deny installation of Ascraeus under PHP 7
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/install/install_install.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/install.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index bb3a74ee5e..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>'; } diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 2542066596..6477a929e9 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -301,10 +301,10 @@ $lang = array_merge($lang, array( 'PHP_REGISTER_GLOBALS_EXPLAIN' => 'phpBB will still run if this setting is enabled, but if possible, it is recommended that register_globals is disabled on your PHP install for security reasons.', 'PHP_SAFE_MODE' => 'Safe mode', 'PHP_SETTINGS' => 'PHP version and settings', - 'PHP_SETTINGS_EXPLAIN' => '<strong>Required</strong> - You must be running at least version 5.3.3 of PHP in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.', + 'PHP_SETTINGS_EXPLAIN' => '<strong>Required</strong> - You must be running at least version 5.3.3 of PHP (PHP 7 is not supported) in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.', 'PHP_URL_FOPEN_SUPPORT' => 'PHP setting <var>allow_url_fopen</var> is enabled', 'PHP_URL_FOPEN_SUPPORT_EXPLAIN' => '<strong>Optional</strong> - This setting is optional, however certain phpBB functions like off-site avatars will not work properly without it.', - 'PHP_VERSION_REQD' => 'PHP version >= 5.3.3', + 'PHP_VERSION_REQD' => 'PHP version: >= 5.3.3, < 7.0.0-dev', 'POST_ID' => 'Post ID', 'PREFIX_FOUND' => 'A scan of your tables has shown a valid installation using <strong>%s</strong> as table prefix.', 'PREPROCESS_STEP' => 'Executing pre-processing functions/queries', |