aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDhruv Goel <dhruv.goel92@gmail.com>2014-06-09 13:22:15 +0530
committerDhruv Goel <dhruv.goel92@gmail.com>2014-06-09 13:22:15 +0530
commit233cdbfd66eea0cbec92cdaa232e7af182547596 (patch)
tree5f68d69d667f7d301957958bfd5ba1de47215f4c
parenta396b647f3d9708ad99d5a9e4b9a1f7f9e3308a2 (diff)
parenta0c442d16ea7686854a42e557406111e5ceb2801 (diff)
downloadforums-233cdbfd66eea0cbec92cdaa232e7af182547596.tar
forums-233cdbfd66eea0cbec92cdaa232e7af182547596.tar.gz
forums-233cdbfd66eea0cbec92cdaa232e7af182547596.tar.bz2
forums-233cdbfd66eea0cbec92cdaa232e7af182547596.tar.xz
forums-233cdbfd66eea0cbec92cdaa232e7af182547596.zip
Merge pull request #2548 from bantu/ticket/12660
[ticket/12660] Improve check for when phpinfo() is disabled.
-rw-r--r--phpBB/includes/acp/acp_php_info.php2
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 7dd345971a..88e2ac3f8d 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);
}