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 #1944 from patbolo/bugfix/debug-no-controller

Browse Source 
FIX Avoid unnecessary user_error when no controller set for friendly err...
This commit is contained in:
Sean Harvey 2013-05-13 22:14:30 -07:00
commit 2beb3519e4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/Debug.php
View File

@ -360,7 +360,7 @@ class Debug {
} }
if(!headers_sent()) { if(!headers_sent()) {
$currController = Controller::curr(); $currController = Controller::has_curr() ? Controller::curr() : null;
// Ensure the error message complies with the HTTP 1.1 spec // Ensure the error message complies with the HTTP 1.1 spec
$msg = strip_tags(str_replace(array("\n", "\r"), '', $friendlyErrorMessage)); $msg = strip_tags(str_replace(array("\n", "\r"), '', $friendlyErrorMessage));
if($currController) { if($currController) {