FIX: exclude error string in headers to prevent white screen display.

silverstripe · Jun 29, 2012 · 48408d3 · 48408d3
1 parent 05cbb36
commit 48408d3
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/dev/Debug.php b/dev/Debug.php
@@ -380,12 +380,15 @@ static function create_debug_view() {
 	 */
 	static function showError($errno, $errstr, $errfile, $errline, $errcontext, $errtype) {
 		if(!headers_sent()) {
-			$errText = "$errtype: \"$errstr\" at line $errline of $errfile";
+			$errText = "$errtype at line $errline of $errfile";
 			$errText = str_replace(array("\n","\r")," ",$errText);
+
 			if(!headers_sent()) header($_SERVER['SERVER_PROTOCOL'] . " 500 $errText");
 
 			// if error is displayed through ajax with CliDebugView, use plaintext output
-			if(Director::is_ajax()) header('Content-Type: text/plain');
+			if(Director::is_ajax()) {
+				header('Content-Type: text/plain');
+			} 
 		}
 
 		// Legacy error handling for customized prototype.js Ajax.Base.responseIsSuccess()