summaryrefslogtreecommitdiffstats
path: root/application/errors
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-03-26 21:08:49 +0200
committerAndrey Andreev <narf@bofh.bg>2012-03-26 21:08:49 +0200
commit1a361209cf77133d2a38132cebe1db17df04a7d4 (patch)
tree9132215eecd4fae44e6dd3e24f5928b8a5d3cad9 /application/errors
parent7fd46308949522f1c7c8853381c2ce7cea093c9a (diff)
parent5bc7a2393187a25f832f18552dbdb8defb23e9d1 (diff)
Merge upstream branch
Diffstat (limited to 'application/errors')
-rw-r--r--application/errors/error_404.php10
-rw-r--r--application/errors/error_db.php10
-rw-r--r--application/errors/error_general.php10
-rw-r--r--application/errors/error_php.php14
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 ?>