diff options
| author | robocoder <anthon.pang@gmail.com> | 2009-07-08 08:19:14 +0400 |
|---|---|---|
| committer | robocoder <anthon.pang@gmail.com> | 2009-07-08 08:19:14 +0400 |
| commit | 4fb541d1bb1b2bed65142ee2ec98a4a554001165 (patch) | |
| tree | 2681dc3b6ee7393c03dca36359a9c9bb8c22d63c /core/ErrorHandler.php | |
| parent | 0cc45658c8f23e14dceb663037f512d47ea4e506 (diff) | |
fixes #803 - remove unnecessary require_once from core, plugins, and parts of
libs. (I didn't touch: open-flash-chart, Zend Framework, and PEAR HTML.)
git-svn-id: http://dev.piwik.org/svn/trunk@1296 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'core/ErrorHandler.php')
| -rw-r--r-- | core/ErrorHandler.php | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/core/ErrorHandler.php b/core/ErrorHandler.php index 8d8acac97e..3a4adcaa48 100644 --- a/core/ErrorHandler.php +++ b/core/ErrorHandler.php @@ -9,11 +9,10 @@ * @package Piwik_Helper */ -require_once "Zend/Registry.php"; - -if(!defined('E_STRICT')) { define('E_STRICT', 2048); } -if(!defined('E_RECOVERABLE_ERROR')){ define('E_RECOVERABLE_ERROR', 4096); } -if(!defined('E_EXCEPTION')) { define('E_EXCEPTION', 8192); } +if(!defined('E_STRICT')) { define('E_STRICT', 2048); } +if(!defined('E_RECOVERABLE_ERROR')) { define('E_RECOVERABLE_ERROR', 4096); } +if(!defined('E_DEPRECATED')) { define('E_DEPRECATED', 8192); } +if(!defined('E_USER_DEPRECATED')) { define('E_USER_DEPRECATED', 16384); } /** * Error handler used to display nicely errors in Piwik @@ -49,7 +48,6 @@ function Piwik_ErrorHandler($errno, $errstr, $errfile, $errline) case E_COMPILE_ERROR: case E_COMPILE_WARNING: case E_USER_ERROR: - case E_EXCEPTION: exit; break; @@ -59,9 +57,10 @@ function Piwik_ErrorHandler($errno, $errstr, $errfile, $errline) case E_USER_NOTICE: case E_STRICT: case E_RECOVERABLE_ERROR: + case E_DEPRECATED: + case E_USER_DEPRECATED: default: // do not exit break; } } - |