diff options
author | Calvin Tam <calvintam236@gmail.com> | 2015-07-20 22:35:48 +0200 |
---|---|---|
committer | Calvin Tam <calvintam236@gmail.com> | 2015-07-20 22:35:48 +0200 |
commit | f5311f105f6e708d89d9c92c4104dd911cf8be26 (patch) | |
tree | 271a431c9464250d15a880ede0b17cfb2d111e7f /application/views/errors/cli | |
parent | 3e1286b00d0bdd37e649fdb706cd7dfddc25447d (diff) | |
parent | 4b9fec6797db2aea3af8ca4080be73e2ff421080 (diff) |
Merge branch 'develop' of https://github.com/bcit-ci/CodeIgniter into develop
Diffstat (limited to 'application/views/errors/cli')
-rw-r--r-- | application/views/errors/cli/error_exception.php | 30 | ||||
-rw-r--r-- | application/views/errors/cli/error_php.php | 28 |
2 files changed, 25 insertions, 33 deletions
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 fec91e54f..0ea9109fa 100644 --- a/application/views/errors/cli/error_php.php +++ b/application/views/errors/cli/error_php.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'); ?> 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 ?> |