tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #590 from willrossi/errorheaders

Browse Source 
FIX: exclude error string in headers to prevent white screen display.
This commit is contained in:
Sam Minnée 2012-06-29 00:51:36 -07:00
commit c07d4ec95e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dev/Debug.php
View File

@ -380,12 +380,15 @@ class Debug {
*/
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()