Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'modules/ErrorHandler.php')
-rwxr-xr-xmodules/ErrorHandler.php34
1 files changed, 4 insertions, 30 deletions
diff --git a/modules/ErrorHandler.php b/modules/ErrorHandler.php
index d7f9b52a0c..cb746380e6 100755
--- a/modules/ErrorHandler.php
+++ b/modules/ErrorHandler.php
@@ -1,36 +1,10 @@
<?php
function Piwik_ErrorHandler($errno, $errstr, $errfile, $errline)
{
- $errno = $errno & error_reporting();
- if($errno == 0) return;
- if(!defined('E_STRICT')) define('E_STRICT', 2048);
- if(!defined('E_RECOVERABLE_ERROR')) define('E_RECOVERABLE_ERROR', 4096);
- print "\n<div style='word-wrap: break-word; border: 3px solid red; padding:4px; width:70%; background-color:#FFFF96;'><b>";
- switch($errno)
- {
- case E_ERROR: print "Error"; break;
- case E_WARNING: print "Warning"; break;
- case E_PARSE: print "Parse Error"; break;
- case E_NOTICE: print "Notice"; break;
- case E_CORE_ERROR: print "Core Error"; break;
- case E_CORE_WARNING: print "Core Warning"; break;
- case E_COMPILE_ERROR: print "Compile Error"; break;
- case E_COMPILE_WARNING: print "Compile Warning"; break;
- case E_USER_ERROR: print "User Error"; break;
- case E_USER_WARNING: print "User Warning"; break;
- case E_USER_NOTICE: print "User Notice"; break;
- case E_STRICT: print "Strict Notice"; break;
- case E_RECOVERABLE_ERROR: print "Recoverable Error"; break;
- default: print "Unknown error ($errno)"; break;
- }
- print ":</b> <i>$errstr</i> in <b>$errfile</b> on line <b>$errline</b>\n";
- print("<br><br>Backtrace --><DIV style='font-family:Courier;font-size:10pt'>");
-
- ob_start();
+ ob_start();
debug_print_backtrace();
- $out1 = ob_get_clean();
- print(str_replace("\n", "<br>", $out1));
- print("</div><br><br>");
- print "\n</pre></div><br>";
+ $backtrace = ob_get_contents();
+ ob_end_clean();
+ Zend_Registry::get('logger_error')->log($errno, $errstr, $errfile, $errline, $backtrace);
}
?>