Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

  • Loading branch information...
commit 48408d323a75a9120f8b5d615268bf439a028651 1 parent 05cbb36
@wilr wilr authored
Showing with 5 additions and 2 deletions.
  1. +5 −2 dev/Debug.php
View
7 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()
Please sign in to comment.
Something went wrong with that request. Please try again.