aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/common.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-12-16 15:48:23 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-12-16 15:48:23 +0000
commitb68de2323d6444b4b3685a98bbcb9500a38e45cb (patch)
tree6046a64891cfc1c2edb3f4b42b0e799f2921c155 /phpBB/common.php
parent51d173ff1e6d3764be4701b92ecfd68007ad1c81 (diff)
downloadforums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar
forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar.gz
forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar.bz2
forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar.xz
forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.zip
merge changes from 3.0.x branch
git-svn-id: file:///svn/phpbb/trunk@10342 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/common.php')
-rw-r--r--phpBB/common.php11
1 files changed, 8 insertions, 3 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index c4a3160102..9b6913e95f 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -19,8 +19,12 @@ if (!defined('IN_PHPBB'))
$starttime = explode(' ', microtime());
$starttime = $starttime[1] + $starttime[0];
-// Report all errors, except notices
-error_reporting(E_ALL ^ E_NOTICE);
+// Report all errors, except notices and deprecation messages
+if (!defined('E_DEPRECATED'))
+{
+ define('E_DEPRECATED', 8192);
+}
+error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
/*
* Remove variables created by register_globals from the global scope
@@ -172,7 +176,8 @@ if (defined('DEBUG_EXTRA'))
}
// Load Extensions
-if (!empty($load_extensions))
+// dl() is deprecated and disabled by default as of PHP 5.3.
+if (!empty($load_extensions) && function_exists('dl'))
{
$load_extensions = explode(',', $load_extensions);