diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-07-20 13:44:40 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-07-20 13:44:40 +0200 |
| commit | 58f7cc999223e2094b3990dd7aa349761fd04009 (patch) | |
| tree | f19648ed3e65ec5142f678d40aeb10c0c5c375e4 | |
| parent | 2d39cd729dd4143afbfa315615f35d3ea2545c95 (diff) | |
[ci skip] Apply changes from PR #3983 to error_exception.php
| -rw-r--r-- | application/views/errors/cli/error_exception.php | 30 | ||||
| -rw-r--r-- | application/views/errors/cli/error_php.php | 4 |
2 files changed, 14 insertions, 20 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 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 |