From b68de2323d6444b4b3685a98bbcb9500a38e45cb Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Wed, 16 Dec 2009 15:48:23 +0000 Subject: merge changes from 3.0.x branch git-svn-id: file:///svn/phpbb/trunk@10342 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/common.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'phpBB/common.php') 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); -- cgit v1.2.1