Merge branch 'develop-ascraeus' into develop

# By Andreas Fischer
# Via Andreas Fischer (1) and others
* develop-ascraeus:
  [ticket/12660] Improve check for when phpinfo() is disabled.
This commit is contained in:
Dhruv 2014-06-09 13:25:24 +05:30
commit d1055bdd9e

View file

@ -47,7 +47,7 @@ class acp_php_info
// for this was nabbed from the PHP annotated manual
preg_match_all('#<body[^>]*>(.*)</body>#si', $phpinfo, $output);
if (empty($phpinfo) || empty($output))
if (empty($phpinfo) || empty($output[1][0]))
{
trigger_error('NO_PHPINFO_AVAILABLE', E_USER_WARNING);
}