mirror of
https://github.com/phpbb/phpbb.git
synced 2025-02-24 03:54:10 +01:00
Merge branch 'develop-olympus' into develop-ascraeus
# By Andreas Fischer # Via Andreas Fischer (1) and Dhruv Goel (1) * develop-olympus: [ticket/12660] Improve check for when phpinfo() is disabled.
This commit is contained in:
commit
5e9cb35457
@ -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);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user