From e48be5ef7c6b73e51ab297c55950180261b6c061 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Thu, 18 Sep 2014 17:07:41 +0200
Subject: Improve handling of PHP errors

This converts any error (including INFO, NOTICE and those hidden with @)
to an exception and displays a nice error page for uncaught exceptions.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 application/errors/error_general.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'application/errors/error_general.php')

diff --git a/application/errors/error_general.php b/application/errors/error_general.php
index be495e4f6..844dfb74d 100644
--- a/application/errors/error_general.php
+++ b/application/errors/error_general.php
@@ -43,6 +43,9 @@ if (class_exists("CI_Controller") && !isset($GLOBALS["is_error_page"])) {
 
 	<?php
 	include 'application/views/footer.php';
+} elseif (php_sapi_name() === 'cli' OR defined('STDIN')) {
+	echo "$heading\n";
+	echo str_replace("<br>", "\n", $message);
 } else {
 	// default CI error page
 ?>
@@ -96,7 +99,7 @@ code {
 	-webkit-box-shadow: 0 0 8px #D0D0D0;
 }
 
-p {
+p, div {
 	margin: 12px 15px 12px 15px;
 }
 </style>
-- 
cgit v1.2.3-24-g4f1b