Merge pull request laravel#507 from sparksp/develop-patch-2

taylorotwell · taylorotwell · commit cac5ebad4a87 · 2012-04-19T06:26:59.000-07:00
Don't show the trace on shutdown, it's useless.
diff --git a/laravel/error.php b/laravel/error.php
@@ -8,7 +8,7 @@ class Error {
 	 * @param  Exception  $exception
 	 * @return void
 	 */
-	public static function exception($exception)
+	public static function exception($exception, $trace = true)
 	{
 		static::log($exception);
 
@@ -23,9 +23,13 @@ public static function exception($exception)
 				  <h3>Message:</h3>
 				  <pre>".$exception->getMessage()."</pre>
 				  <h3>Location:</h3>
-				  <pre>".$exception->getFile()." on line ".$exception->getLine()."</pre>
+				  <pre>".$exception->getFile()." on line ".$exception->getLine()."</pre>";
+			if ($trace)
+			{
+				echo "
 				  <h3>Stack Trace:</h3>
 				  <pre>".$exception->getTraceAsString()."</pre></html>";
+			}
 		}
 
 		// If we're not using detailed error messages, we'll use the event
@@ -83,7 +87,7 @@ public static function shutdown()
 		{
 			extract($error, EXTR_SKIP);
 
-			static::exception(new \ErrorException($message, $type, 0, $file, $line));
+			static::exception(new \ErrorException($message, $type, 0, $file, $line), false);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ class Error {`
`8`	`8`	`* @param Exception $exception`
`9`	`9`	`* @return void`
`10`	`10`	`*/`
`11`		`- public static function exception($exception)`
	`11`	`+ public static function exception($exception, $trace = true)`
`12`	`12`	`{`
`13`	`13`	`static::log($exception);`
`14`	`14`
`@@ -23,9 +23,13 @@ public static function exception($exception)`
`23`	`23`	`<h3>Message:</h3>`
`24`	`24`	`<pre>".$exception->getMessage()."</pre>`
`25`	`25`	`<h3>Location:</h3>`
`26`		`- <pre>".$exception->getFile()." on line ".$exception->getLine()."</pre>`
	`26`	`+ <pre>".$exception->getFile()." on line ".$exception->getLine()."</pre>";`
	`27`	`+ if ($trace)`
	`28`	`+ {`
	`29`	`+ echo "`
`27`	`30`	`<h3>Stack Trace:</h3>`
`28`	`31`	`<pre>".$exception->getTraceAsString()."</pre></html>";`
	`32`	`+ }`
`29`	`33`	`}`
`30`	`34`
`31`	`35`	`// If we're not using detailed error messages, we'll use the event`
@@ -83,7 +87,7 @@ public static function shutdown()
`83`	`87`	`{`
`84`	`88`	`extract($error, EXTR_SKIP);`
`85`	`89`
`86`		`- static::exception(new \ErrorException($message, $type, 0, $file, $line));`
	`90`	`+ static::exception(new \ErrorException($message, $type, 0, $file, $line), false);`
`87`	`91`	`}`
`88`	`92`	`}`
`89`	`93`