aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-06-20 22:45:55 +0200
committerAndreas Fischer <bantu@phpbb.com>2010-06-20 22:45:55 +0200
commitd537dc60ce8a70ac9d85fe883c46c122454b7ce8 (patch)
treeb927c1ecedca672c829bb2a51788e0f4eabf903b
parentb91950d41386c135e787ad0d9ece7b94fd7152f4 (diff)
parent52c3b51c95b408a284bd278379679ad00a2151af (diff)
downloadforums-d537dc60ce8a70ac9d85fe883c46c122454b7ce8.tar
forums-d537dc60ce8a70ac9d85fe883c46c122454b7ce8.tar.gz
forums-d537dc60ce8a70ac9d85fe883c46c122454b7ce8.tar.bz2
forums-d537dc60ce8a70ac9d85fe883c46c122454b7ce8.tar.xz
forums-d537dc60ce8a70ac9d85fe883c46c122454b7ce8.zip
Merge branch 'ticket/bantu/9656' into develop-olympus
* ticket/bantu/9656: [ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.
-rw-r--r--phpBB/includes/acp/acp_php_info.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_php_info.php b/phpBB/includes/acp/acp_php_info.php
index 9935c0466e..0499095004 100644
--- a/phpBB/includes/acp/acp_php_info.php
+++ b/phpBB/includes/acp/acp_php_info.php
@@ -35,9 +35,9 @@ class acp_php_info
$this->tpl_name = 'acp_php_info';
$this->page_title = 'ACP_PHP_INFO';
-
+
ob_start();
- @phpinfo(INFO_GENERAL | INFO_CONFIGURATION | INFO_MODULES | INFO_VARIABLES);
+ phpinfo(INFO_GENERAL | INFO_CONFIGURATION | INFO_MODULES | INFO_VARIABLES);
$phpinfo = ob_get_clean();
$phpinfo = trim($phpinfo);