improved errorhandler output

when error occurs while handling errors output was not readable in web context

improved errorhandler output
3a981e26 · Carsten Brandt · ee89134f · 3a981e26
Commit 3a981e26 authored Oct 13, 2013 by Carsten Brandt
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

Application.php framework/yii/base/Application.php +5 -1

No files found.
--- a/framework/yii/base/Application.php
+++ b/framework/yii/base/Application.php
@@ -450,7 +450,11 @@ abstract class Application extends Module
 			$msg .= "\nPrevious exception:\n";
 			$msg .= (string)$exception;
 			if (YII_DEBUG) {
-				echo $msg;
+				if (PHP_SAPI === 'cli') {
+					echo $msg . "\n";
+				} else {
+					echo '<pre>' . htmlspecialchars($msg, ENT_QUOTES, $this->charset) . '</pre>';
+				}
 			}
 			$msg .= "\n\$_SERVER = " . var_export($_SERVER, true);
 			error_log($msg);