Merge pull request #1944 from patbolo/bugfix/debug-no-controller

FIX Avoid unnecessary user_error when no controller set for friendly err...
2013-05-13 22:14:30 -07:00 · 2013-05-13 22:14:30 -07:00 · 2beb3519e4
parent a4f0983220 3de75f396e
commit 2beb3519e4
1 changed files with 1 additions and 1 deletions
--- a/dev/Debug.php
+++ b/dev/Debug.php
@ -360,7 +360,7 @@ class Debug {
 		}

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