diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2017-01-15 18:13:00 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-01-15 18:13:00 +0100 |
| commit | c4ee378456a8018dacd831598adcc782c62f69e9 (patch) | |
| tree | 0162c7d32f14876b85d799fa88e88dbaa2cf9ca9 /phpBB | |
| parent | e64072e01f59360ba5c6d8b73b5075e21c6dad48 (diff) | |
| parent | 766839a60a897c1e5bee812b644b66ea3c94f832 (diff) | |
| download | forums-c4ee378456a8018dacd831598adcc782c62f69e9.tar forums-c4ee378456a8018dacd831598adcc782c62f69e9.tar.gz forums-c4ee378456a8018dacd831598adcc782c62f69e9.tar.bz2 forums-c4ee378456a8018dacd831598adcc782c62f69e9.tar.xz forums-c4ee378456a8018dacd831598adcc782c62f69e9.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/11076] State current and minimum required versions in old PHP notice
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_main.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/acp/common.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index 8dec7c69bd..68d7384865 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -429,11 +429,11 @@ class acp_main // Version check $user->add_lang('install'); - if ($auth->acl_get('a_server') && version_compare(PHP_VERSION, '5.4', '<')) + if ($auth->acl_get('a_server') && version_compare(PHP_VERSION, '5.4.0', '<')) { $template->assign_vars(array( 'S_PHP_VERSION_OLD' => true, - 'L_PHP_VERSION_OLD' => sprintf($user->lang['PHP_VERSION_OLD'], '<a href="https://www.phpbb.com/community/viewtopic.php?f=14&t=2152375">', '</a>'), + 'L_PHP_VERSION_OLD' => sprintf($user->lang['PHP_VERSION_OLD'], PHP_VERSION, '5.4.0', '<a href="https://www.phpbb.com/support/docs/en/3.2/ug/quickstart/requirements">', '</a>'), )); } diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index acd9776dd7..ac2c9da84d 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -395,7 +395,7 @@ $lang = array_merge($lang, array( 'NUMBER_USERS' => 'Number of users', 'NUMBER_ORPHAN' => 'Orphan attachments', - 'PHP_VERSION_OLD' => 'The version of PHP on this server will no longer be supported by future versions of phpBB. %sDetails%s', + 'PHP_VERSION_OLD' => 'The version of PHP on this server (%1$s) will no longer be supported by future versions of phpBB. The minimum required version will be PHP %2$s. %3$sDetails%4$s', 'POSTS_PER_DAY' => 'Posts per day', |