From a970382924a6d8792625e5fe85f731495f6fd2e1 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Sun, 22 Mar 2009 08:38:14 +0000
Subject: [PATCH] BUGFIX #3579 bgribaudo: Error in error text rendering

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73490 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 dev/Debug.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/Debug.php b/dev/Debug.php
index ed6c622d5..8f2bb710d 100644
--- a/dev/Debug.php
+++ b/dev/Debug.php
@@ -649,21 +649,21 @@ function exceptionHandler($exception) {
  * @param string $errstr
  * @param string $errfile
  * @param int $errline
- * @param string $errcontext
  */
-function errorHandler($errno, $errstr, $errfile, $errline, $errcontext) {
+function errorHandler($errno, $errstr, $errfile, $errline) {
+    $bt = debug_backtrace();
 	switch($errno) {
 		case E_ERROR:
 		case E_CORE_ERROR:
 		case E_USER_ERROR:
-			Debug::fatalHandler($errno, $errstr, $errfile, $errline, $errcontext);
+			Debug::fatalHandler($errno, $errstr, $errfile, $errline, $bt);
 			break;
 
 		case E_NOTICE:
 		case E_WARNING:
 		case E_CORE_WARNING:
 		case E_USER_WARNING:
-			Debug::warningHandler($errno, $errstr, $errfile, $errline, $errcontext);
+			Debug::warningHandler($errno, $errstr, $errfile, $errline, $bt);
 			break;
 			
 	}