diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2014-06-09 13:23:49 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2014-06-09 13:23:49 +0530 |
| commit | 5e9cb35457bbaf15655146ea5f9ad1180c372bb2 (patch) | |
| tree | 4eb3e72e2a9fdb2ddd2aae56534e8bf9d241f714 | |
| parent | 14d0a5f66bce8ab400e274442816babc99e0c928 (diff) | |
| parent | 233cdbfd66eea0cbec92cdaa232e7af182547596 (diff) | |
| download | forums-5e9cb35457bbaf15655146ea5f9ad1180c372bb2.tar forums-5e9cb35457bbaf15655146ea5f9ad1180c372bb2.tar.gz forums-5e9cb35457bbaf15655146ea5f9ad1180c372bb2.tar.bz2 forums-5e9cb35457bbaf15655146ea5f9ad1180c372bb2.tar.xz forums-5e9cb35457bbaf15655146ea5f9ad1180c372bb2.zip | |
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.
| -rw-r--r-- | phpBB/includes/acp/acp_php_info.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_php_info.php b/phpBB/includes/acp/acp_php_info.php index 0e06c94869..810a111edb 100644 --- a/phpBB/includes/acp/acp_php_info.php +++ b/phpBB/includes/acp/acp_php_info.php @@ -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); } |