Fixing ErrorHandler stuff.

1 files changed, 4 insertions, 2 deletions

diff --git a/index.php b/index.php
index 4347ddd41d..0839100d32 100644
--- a/index.php
+++ b/index.php
@@ -9,6 +9,7 @@
  */
 
 use Piwik\FrontController;
+use Piwik\Error;
 
 define('PIWIK_DOCUMENT_ROOT', dirname(__FILE__) == '/' ? '' : dirname(__FILE__));
 if (file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php')) {
@@ -39,9 +40,10 @@ require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
 require_once PIWIK_INCLUDE_PATH . '/core/functions.php';
 
 if (!defined('PIWIK_ENABLE_ERROR_HANDLER') || PIWIK_ENABLE_ERROR_HANDLER) {
-    require_once PIWIK_INCLUDE_PATH . '/core/ErrorHandler.php';
+    require_once PIWIK_INCLUDE_PATH . '/core/Error.php';
+    Error::setErrorHandler();
+    
     require_once PIWIK_INCLUDE_PATH . '/core/ExceptionHandler.php';
-    set_error_handler('Piwik_ErrorHandler');
     set_exception_handler('Piwik_ExceptionHandler');
 }