diff options
| author | Mike Funk <mfunk@xulonpress.com> | 2012-02-23 20:52:23 +0100 |
|---|---|---|
| committer | Mike Funk <mfunk@xulonpress.com> | 2012-02-23 20:52:23 +0100 |
| commit | 27a536dd3570f867ef807ab12391da032b32f09a (patch) | |
| tree | 344b7dab21ea563e54567e428de3791c146e3ae3 /application/errors | |
| parent | 8afb848fded8fbdfa24b72df7f067e960c83c0e8 (diff) | |
| parent | e2675736f3a68b1f64e135d827f6a70e0ae892fb (diff) | |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'application/errors')
| -rw-r--r-- | application/errors/error_404.php | 28 | ||||
| -rw-r--r-- | application/errors/error_db.php | 28 | ||||
| -rw-r--r-- | application/errors/error_general.php | 28 | ||||
| -rw-r--r-- | application/errors/error_php.php | 45 |
4 files changed, 129 insertions, 0 deletions
diff --git a/application/errors/error_404.php b/application/errors/error_404.php index bddee6cc6..4dd8fc407 100644 --- a/application/errors/error_404.php +++ b/application/errors/error_404.php @@ -1,3 +1,31 @@ +<?php +/** + * CodeIgniter + * + * An open source application development framework for PHP 5.1.6 or newer + * + * NOTICE OF LICENSE + * + * Licensed under the Academic Free License version 3.0 + * + * This source file is subject to the Academic Free License (AFL 3.0) that is + * bundled with this package in the files license_afl.txt / license_afl.rst. + * It is also available through the world wide web at this URL: + * http://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to obtain it + * through the world wide web, please send an email to + * licensing@ellislab.com so we can send you a copy immediately. + * + * @package CodeIgniter + * @author EllisLab Dev Team + * @copyright Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/) + * @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0) + * @link http://codeigniter.com + * @since Version 1.0 + * @filesource + */ +?> + <!DOCTYPE html> <html lang="en"> <head> diff --git a/application/errors/error_db.php b/application/errors/error_db.php index bc7c4478a..130ffc11d 100644 --- a/application/errors/error_db.php +++ b/application/errors/error_db.php @@ -1,3 +1,31 @@ +<?php +/** + * CodeIgniter + * + * An open source application development framework for PHP 5.1.6 or newer + * + * NOTICE OF LICENSE + * + * Licensed under the Academic Free License version 3.0 + * + * This source file is subject to the Academic Free License (AFL 3.0) that is + * bundled with this package in the files license_afl.txt / license_afl.rst. + * It is also available through the world wide web at this URL: + * http://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to obtain it + * through the world wide web, please send an email to + * licensing@ellislab.com so we can send you a copy immediately. + * + * @package CodeIgniter + * @author EllisLab Dev Team + * @copyright Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/) + * @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0) + * @link http://codeigniter.com + * @since Version 1.0 + * @filesource + */ +?> + <!DOCTYPE html> <html lang="en"> <head> diff --git a/application/errors/error_general.php b/application/errors/error_general.php index 8b3746285..2a844a8e2 100644 --- a/application/errors/error_general.php +++ b/application/errors/error_general.php @@ -1,3 +1,31 @@ +<?php +/** + * CodeIgniter + * + * An open source application development framework for PHP 5.1.6 or newer + * + * NOTICE OF LICENSE + * + * Licensed under the Academic Free License version 3.0 + * + * This source file is subject to the Academic Free License (AFL 3.0) that is + * bundled with this package in the files license_afl.txt / license_afl.rst. + * It is also available through the world wide web at this URL: + * http://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to obtain it + * through the world wide web, please send an email to + * licensing@ellislab.com so we can send you a copy immediately. + * + * @package CodeIgniter + * @author EllisLab Dev Team + * @copyright Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/) + * @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0) + * @link http://codeigniter.com + * @since Version 1.0 + * @filesource + */ +?> + <!DOCTYPE html> <html lang="en"> <head> diff --git a/application/errors/error_php.php b/application/errors/error_php.php index f085c2037..8e293cd5e 100644 --- a/application/errors/error_php.php +++ b/application/errors/error_php.php @@ -1,3 +1,31 @@ +<?php +/** + * CodeIgniter + * + * An open source application development framework for PHP 5.1.6 or newer + * + * NOTICE OF LICENSE + * + * Licensed under the Academic Free License version 3.0 + * + * This source file is subject to the Academic Free License (AFL 3.0) that is + * bundled with this package in the files license_afl.txt / license_afl.rst. + * It is also available through the world wide web at this URL: + * http://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to obtain it + * through the world wide web, please send an email to + * licensing@ellislab.com so we can send you a copy immediately. + * + * @package CodeIgniter + * @author EllisLab Dev Team + * @copyright Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/) + * @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0) + * @link http://codeigniter.com + * @since Version 1.0 + * @filesource + */ +?> + <div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;"> <h4>A PHP Error was encountered</h4> @@ -7,4 +35,21 @@ <p>Filename: <?php echo $filepath; ?></p> <p>Line Number: <?php echo $line; ?></p> +<?php if(defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?> + + <p>Backtrace: </p> + <?php foreach(debug_backtrace() as $error): ?> + + <?php if(isset($error['file']) && ! stristr($error['file'], SYSDIR)): ?> + <p style="margin-left:10px"> + File: <?php echo $error['file'] ?><br /> + Line: <?php echo $error['line'] ?><br /> + Function: <?php echo $error['function'] ?> + </p> + <?php endif ?> + + <?php endforeach ?></p> + +<?php endif ?> + </div>
\ No newline at end of file |