Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
This commit is contained in:
Nils Adermann 2012-11-09 23:47:07 +01:00
commit 55e8decb3a

View file

@ -426,7 +426,7 @@ class acp_main
// Version check // Version check
$user->add_lang('install'); $user->add_lang('install');
if ($auth->acl_get('a_server') && version_compare(PHP_VERSION, '5.3.2', '<')) if ($auth->acl_get('a_server') && version_compare(PHP_VERSION, '5.3.3', '<'))
{ {
$template->assign_vars(array( $template->assign_vars(array(
'S_PHP_VERSION_OLD' => true, 'S_PHP_VERSION_OLD' => true,