From 20473fa9612caaa8eba5acbe81110cf1e5b25970 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 18 Jul 2015 10:45:43 +0900
Subject: Fix errors/cli/error_php.php output

Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>
---
 application/views/errors/cli/error_php.php | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'application/views')

diff --git a/application/views/errors/cli/error_php.php b/application/views/errors/cli/error_php.php
index fec91e54f..ed181a887 100644
--- a/application/views/errors/cli/error_php.php
+++ b/application/views/errors/cli/error_php.php
@@ -4,22 +4,20 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 
 A PHP Error was encountered
 
-Severity: <?php echo $severity;?>
-Message:  <?php echo $message;?>
-Filename: <?php echo $filepath;?>
+Severity: <?php echo $severity, "\n";?>
+Message:  <?php echo $message, "\n";?>
+Filename: <?php echo $filepath, "\n";?>
 Line Number: <?php echo $line;?>
 
 <?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
 
 Backtrace:
-	<?php foreach (debug_backtrace() as $error): ?>
-		<?php if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+<?php foreach (debug_backtrace() as $error): ?>
+<?php if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+	File: <?php echo $error['file'], "\n";?>
+	Line: <?php echo $error['line'], "\n";?>
+	Function: <?php echo $error['function'], "\n\n";?>
+<?php endif ?>
+<?php endforeach ?>
 
-	File: <?php echo $error['file'];?>
-	Line: <?php echo $error['line'];?>
-	Function: <?php echo $error['function'];?>
-
-		<?php endif ?>
-
-	<?php endforeach ?>
-<?php endif ?>
\ No newline at end of file
+<?php endif ?>
-- 
cgit v1.2.3-24-g4f1b


From 11fdc643f5125ed1e2bb0009e423332c717f707a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 20 Jul 2015 20:34:39 +0900
Subject: Fix indentation

Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>
---
 application/views/errors/cli/error_php.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'application/views')

diff --git a/application/views/errors/cli/error_php.php b/application/views/errors/cli/error_php.php
index ed181a887..d977f8464 100644
--- a/application/views/errors/cli/error_php.php
+++ b/application/views/errors/cli/error_php.php
@@ -12,12 +12,12 @@ Line Number: <?php echo $line;?>
 <?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
 
 Backtrace:
-<?php foreach (debug_backtrace() as $error): ?>
-<?php if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+<?php	foreach (debug_backtrace() as $error): ?>
+<?php		if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
 	File: <?php echo $error['file'], "\n";?>
 	Line: <?php echo $error['line'], "\n";?>
 	Function: <?php echo $error['function'], "\n\n";?>
-<?php endif ?>
-<?php endforeach ?>
+<?php		endif ?>
+<?php	endforeach ?>
 
 <?php endif ?>
-- 
cgit v1.2.3-24-g4f1b


From 58f7cc999223e2094b3990dd7aa349761fd04009 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 20 Jul 2015 14:44:40 +0300
Subject: [ci skip] Apply changes from PR #3983 to error_exception.php

---
 application/views/errors/cli/error_exception.php | 30 ++++++++++--------------
 application/views/errors/cli/error_php.php       |  4 +---
 2 files changed, 14 insertions(+), 20 deletions(-)

(limited to 'application/views')

diff --git a/application/views/errors/cli/error_exception.php b/application/views/errors/cli/error_exception.php
index 75d7f0fad..0203cf467 100644
--- a/application/views/errors/cli/error_exception.php
+++ b/application/views/errors/cli/error_exception.php
@@ -1,25 +1,21 @@
-<?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-?>
+<?php defined('BASEPATH') OR exit('No direct script access allowed'); ?>
 
 An uncaught Exception was encountered
 
-Type: <?php echo get_class($exception); ?>
-Message: <?php echo $message; ?>
-Filename: <?php echo $exception->getFile(); ?>
-Line Number: <?php echo $exception->getLine(); ?>
+Type: <?php echo get_class($exception), "\n"; ?>
+Message: <?php echo $message, "\n"; ?>
+Filename: <?php echo $exception->getFile(), "\n"; ?>
+Line Number: <?php echo $exception->getLine(), "\n"; ?>
 
 <?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
 
 Backtrace:
-	<?php foreach ($exception->getTrace() as $error): ?>
-		<?php if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+<?php	foreach ($exception->getTrace() as $error): ?>
+<?php		if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+	File: <?php echo $error['file'], "\n"; ?>
+	Line: <?php echo $error['line'], "\n"; ?>
+	Function: <?php echo $error['function'], "\n\n"; ?>
+<?php		endif ?>
+<?php	endforeach ?>
 
-	File: <?php echo $error['file']; ?>
-	Line: <?php echo $error['line']; ?>
-	Function: <?php echo $error['function']; ?>
-
-		<?php endif ?>
-
-	<?php endforeach ?>
-<?php endif ?>
\ No newline at end of file
+<?php endif ?>
diff --git a/application/views/errors/cli/error_php.php b/application/views/errors/cli/error_php.php
index d977f8464..0ea9109fa 100644
--- a/application/views/errors/cli/error_php.php
+++ b/application/views/errors/cli/error_php.php
@@ -1,6 +1,4 @@
-<?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-?>
+<?php defined('BASEPATH') OR exit('No direct script access allowed'); ?>
 
 A PHP Error was encountered
 
-- 
cgit v1.2.3-24-g4f1b