diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-29 10:36:14 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-29 10:36:14 +0200 |
| commit | 5b46f42d654e7474a47ecfd9f7dafece98ee668e (patch) | |
| tree | ba1641fa43469ea3b58c2b1904de9b68c750d26a /application/errors | |
| parent | 8aea4f49c81199661d3f6e49ff6142b886ea7226 (diff) | |
| parent | 38b2a256758ee8184d354cbdb0eac467118af36b (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-postgre
Diffstat (limited to 'application/errors')
| -rw-r--r-- | application/errors/error_404.php | 10 | ||||
| -rw-r--r-- | application/errors/error_db.php | 10 | ||||
| -rw-r--r-- | application/errors/error_general.php | 10 | ||||
| -rw-r--r-- | application/errors/error_php.php | 14 |
4 files changed, 19 insertions, 25 deletions
diff --git a/application/errors/error_404.php b/application/errors/error_404.php index 9af9e39de..746032956 100644 --- a/application/errors/error_404.php +++ b/application/errors/error_404.php @@ -1,13 +1,13 @@ -<?php +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); /** * CodeIgniter * * An open source application development framework for PHP 5.2.4 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: @@ -24,9 +24,7 @@ * @since Version 1.0 * @filesource */ -?> - -<!DOCTYPE html> +?><!DOCTYPE html> <html lang="en"> <head> <meta charset="utf-8"> diff --git a/application/errors/error_db.php b/application/errors/error_db.php index 81ff02adb..eb3a75260 100644 --- a/application/errors/error_db.php +++ b/application/errors/error_db.php @@ -1,13 +1,13 @@ -<?php +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); /** * CodeIgniter * * An open source application development framework for PHP 5.2.4 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: @@ -24,9 +24,7 @@ * @since Version 1.0 * @filesource */ -?> - -<!DOCTYPE html> +?><!DOCTYPE html> <html lang="en"> <head> <meta charset="utf-8"> diff --git a/application/errors/error_general.php b/application/errors/error_general.php index 8efcfd991..59896e1ea 100644 --- a/application/errors/error_general.php +++ b/application/errors/error_general.php @@ -1,13 +1,13 @@ -<?php +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); /** * CodeIgniter * * An open source application development framework for PHP 5.2.4 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: @@ -24,9 +24,7 @@ * @since Version 1.0 * @filesource */ -?> - -<!DOCTYPE html> +?><!DOCTYPE html> <html lang="en"> <head> <meta charset="utf-8"> diff --git a/application/errors/error_php.php b/application/errors/error_php.php index 42e5f5a28..3855720de 100644 --- a/application/errors/error_php.php +++ b/application/errors/error_php.php @@ -1,13 +1,13 @@ -<?php +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); /** * CodeIgniter * * An open source application development framework for PHP 5.2.4 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: @@ -35,11 +35,11 @@ <p>Filename: <?php echo $filepath; ?></p> <p>Line Number: <?php echo $line; ?></p> -<?php if(defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?> - +<?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 /> @@ -47,7 +47,7 @@ Function: <?php echo $error['function'] ?> </p> <?php endif ?> - + <?php endforeach ?></p> <?php endif ?> |