From 2873ac64f1476551cc546f30ec6187e580cc8155 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Thu, 13 Oct 2011 11:23:44 -0300
Subject: Added simple backtrace to php error file

---
 application/errors/error_php.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'application/errors/error_php.php')

diff --git a/application/errors/error_php.php b/application/errors/error_php.php
index f085c2037..279556a98 100644
--- a/application/errors/error_php.php
+++ b/application/errors/error_php.php
@@ -6,5 +6,14 @@
 <p>Message:  <?php echo $message; ?></p>
 <p>Filename: <?php echo $filepath; ?></p>
 <p>Line Number: <?php echo $line; ?></p>
-
+<p>Backtrace: </p>
+<?php foreach(debug_backtrace() as $error): ?>
+<?php if(isset($error['file']) && !stristr($error['file'], SYSDIR)): ?>
+	<p>
+	File: <?php echo $error['file'] ?><br />
+	Line: <?php echo $error['line'] ?><br />
+	Function: <?php echo $error['function'] ?>
+	</p>
+<? endif ?>
+<? endforeach ?></p>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From bb117677ab5a6096168f7c052853c94ecba19339 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Thu, 13 Oct 2011 11:52:02 -0300
Subject: Fixed code style issue

---
 application/errors/error_php.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'application/errors/error_php.php')

diff --git a/application/errors/error_php.php b/application/errors/error_php.php
index 279556a98..cebf91724 100644
--- a/application/errors/error_php.php
+++ b/application/errors/error_php.php
@@ -8,7 +8,7 @@
 <p>Line Number: <?php echo $line; ?></p>
 <p>Backtrace: </p>
 <?php foreach(debug_backtrace() as $error): ?>
-<?php if(isset($error['file']) && !stristr($error['file'], SYSDIR)): ?>
+<?php if(isset($error['file']) &&  ! stristr($error['file'], SYSDIR)): ?>
 	<p>
 	File: <?php echo $error['file'] ?><br />
 	Line: <?php echo $error['line'] ?><br />
-- 
cgit v1.2.3-24-g4f1b


From 5600828101627a76768e4f1edbb0197d11885318 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Thu, 13 Oct 2011 11:59:44 -0300
Subject: Switch debug backtrace based on SHOW_ERROR_BACKTRACE contstant

---
 application/errors/error_php.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'application/errors/error_php.php')

diff --git a/application/errors/error_php.php b/application/errors/error_php.php
index cebf91724..cf6cb9fac 100644
--- a/application/errors/error_php.php
+++ b/application/errors/error_php.php
@@ -6,14 +6,16 @@
 <p>Message:  <?php echo $message; ?></p>
 <p>Filename: <?php echo $filepath; ?></p>
 <p>Line Number: <?php echo $line; ?></p>
-<p>Backtrace: </p>
-<?php foreach(debug_backtrace() as $error): ?>
-<?php if(isset($error['file']) &&  ! stristr($error['file'], SYSDIR)): ?>
-	<p>
-	File: <?php echo $error['file'] ?><br />
-	Line: <?php echo $error['line'] ?><br />
-	Function: <?php echo $error['function'] ?>
-	</p>
-<? endif ?>
-<? endforeach ?></p>
+<?php if(defined('SHOW_ERROR_BACKTRACE') && SHOW_ERROR_BACKTRACE === TRUE): ?>
+	<p>Backtrace: </p>
+	<?php foreach(debug_backtrace() as $error): ?>
+	<?php if(isset($error['file']) &&  ! stristr($error['file'], SYSDIR)): ?>
+		<p>
+		File: <?php echo $error['file'] ?><br />
+		Line: <?php echo $error['line'] ?><br />
+		Function: <?php echo $error['function'] ?>
+		</p>
+	<? endif ?>
+	<? endforeach ?></p>
+<?php endif ?>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From d609a59ab5f30bc0ee0d9d5b619a1201fef59461 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Tue, 18 Oct 2011 06:27:31 -0400
Subject: Minor formatting changes

---
 application/errors/error_php.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'application/errors/error_php.php')

diff --git a/application/errors/error_php.php b/application/errors/error_php.php
index cf6cb9fac..f2f71857f 100644
--- a/application/errors/error_php.php
+++ b/application/errors/error_php.php
@@ -6,16 +6,21 @@
 <p>Message:  <?php echo $message; ?></p>
 <p>Filename: <?php echo $filepath; ?></p>
 <p>Line Number: <?php echo $line; ?></p>
+
 <?php if(defined('SHOW_ERROR_BACKTRACE') && SHOW_ERROR_BACKTRACE === TRUE): ?>
+	
 	<p>Backtrace: </p>
 	<?php foreach(debug_backtrace() as $error): ?>
-	<?php if(isset($error['file']) &&  ! stristr($error['file'], SYSDIR)): ?>
-		<p>
-		File: <?php echo $error['file'] ?><br />
-		Line: <?php echo $error['line'] ?><br />
-		Function: <?php echo $error['function'] ?>
-		</p>
-	<? endif ?>
+	
+		<?php if(isset($error['file']) &&  ! stristr($error['file'], SYSDIR)): ?>
+			<p>
+			File: <?php echo $error['file'] ?><br />
+			Line: <?php echo $error['line'] ?><br />
+			Function: <?php echo $error['function'] ?>
+			</p>
+		<? endif ?>
+	
 	<? endforeach ?></p>
+
 <?php endif ?>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 8bf00384deafdb73e00422dd5c9f541564ea85ca Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Tue, 18 Oct 2011 06:28:41 -0400
Subject: Minor formatting changes

---
 application/errors/error_php.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'application/errors/error_php.php')

diff --git a/application/errors/error_php.php b/application/errors/error_php.php
index f2f71857f..b7fdec44a 100644
--- a/application/errors/error_php.php
+++ b/application/errors/error_php.php
@@ -23,4 +23,5 @@
 	<? endforeach ?></p>
 
 <?php endif ?>
+
 </div>
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 5160cc9a869e27a696f93f64127eef15c54f5d64 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Tue, 18 Oct 2011 06:50:06 -0400
Subject: Renamed constant, added 10px margin to backtrace

---
 application/errors/error_php.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'application/errors/error_php.php')

diff --git a/application/errors/error_php.php b/application/errors/error_php.php
index b7fdec44a..514e477e8 100644
--- a/application/errors/error_php.php
+++ b/application/errors/error_php.php
@@ -7,13 +7,13 @@
 <p>Filename: <?php echo $filepath; ?></p>
 <p>Line Number: <?php echo $line; ?></p>
 
-<?php if(defined('SHOW_ERROR_BACKTRACE') && SHOW_ERROR_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>
+			<p style="margin-left:10px">
 			File: <?php echo $error['file'] ?><br />
 			Line: <?php echo $error['line'] ?><br />
 			Function: <?php echo $error['function'] ?>
-- 
cgit v1.2.3-24-g4f1b


From f4a4bd8fac188ebc9cda822ffc811c218fd92b45 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Thu, 20 Oct 2011 12:18:42 -0500
Subject: adding new license file (OSL 3.0) and updating readme to ReST

added notice of license to all source files.
OSL to all except the few files we ship inside of the application folder, those are AFL.
Updated license in user guide.

incrementing next dev version to 3.0 due to licensing change
---
 application/errors/error_php.php | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'application/errors/error_php.php')

diff --git a/application/errors/error_php.php b/application/errors/error_php.php
index 514e477e8..4a8c9a8ce 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 Open Software License (OSL 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 - 2011, 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>
-- 
cgit v1.2.3-24-g4f1b


From 61df9060d468ce28c40ee4a57d108763f80ec583 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Fri, 21 Oct 2011 09:55:40 -0500
Subject: fixing typo in attribution block

---
 application/errors/error_php.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'application/errors/error_php.php')

diff --git a/application/errors/error_php.php b/application/errors/error_php.php
index 4a8c9a8ce..ec2a3f10a 100644
--- a/application/errors/error_php.php
+++ b/application/errors/error_php.php
@@ -8,7 +8,7 @@
  * 
  * Licensed under the Academic Free License version 3.0
  * 
- * This source file is subject to the Open Software License (OSL 3.0) that is
+ * 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
-- 
cgit v1.2.3-24-g4f1b


From 7710854ec5f3c551f8ee5f49a6a1a26ea7de5c36 Mon Sep 17 00:00:00 2001
From: Burak Erdem <burakerdem@gmail.com>
Date: Sun, 23 Oct 2011 01:00:11 +0300
Subject: Removed short open tags.

---
 application/errors/error_php.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'application/errors/error_php.php')

diff --git a/application/errors/error_php.php b/application/errors/error_php.php
index ec2a3f10a..1bf245465 100644
--- a/application/errors/error_php.php
+++ b/application/errors/error_php.php
@@ -46,9 +46,9 @@
 			Line: <?php echo $error['line'] ?><br />
 			Function: <?php echo $error['function'] ?>
 			</p>
-		<? endif ?>
+		<?php endif ?>
 	
-	<? endforeach ?></p>
+	<?php endforeach ?></p>
 
 <?php endif ?>
 
-- 
cgit v1.2.3-24-g4f1b


From 0defe5d33ee2633f377a109519ca818becc60f64 Mon Sep 17 00:00:00 2001
From: Greg Aker <greg@gregaker.net>
Date: Sun, 1 Jan 2012 18:46:41 -0600
Subject: Updating copyright date to 2012

---
 application/errors/error_php.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'application/errors/error_php.php')

diff --git a/application/errors/error_php.php b/application/errors/error_php.php
index 1bf245465..8e293cd5e 100644
--- a/application/errors/error_php.php
+++ b/application/errors/error_php.php
@@ -18,7 +18,7 @@
  *
  * @package		CodeIgniter
  * @author		EllisLab Dev Team
- * @copyright	Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/)
+ * @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
-- 
cgit v1.2.3-24-g4f1b


From 07c1ac830b4e98aa40f48baef3dd05fb68c0a836 Mon Sep 17 00:00:00 2001
From: Phil Sturgeon <email@philsturgeon.co.uk>
Date: Fri, 9 Mar 2012 17:03:37 +0000
Subject: Bumped CodeIgniter's PHP requirement to 5.2.4. Yes I know PHP 5.4
 just came out, and yes I know PHP 5.3 has lovely features, but there are
 plenty of corporate systems running on CodeIgniter and PHP 5.3 still is not
 widely supported enough. CodeIgniter is great for distributed applications,
 and this is the highest we can reasonably go without breaking support. PHP
 5.3 will most likely happen in another year or so. Fingers crossed on that
 one anyway...

---
 application/errors/error_php.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'application/errors/error_php.php')

diff --git a/application/errors/error_php.php b/application/errors/error_php.php
index 8e293cd5e..42e5f5a28 100644
--- a/application/errors/error_php.php
+++ b/application/errors/error_php.php
@@ -2,7 +2,7 @@
 /**
  * CodeIgniter
  *
- * An open source application development framework for PHP 5.1.6 or newer
+ * An open source application development framework for PHP 5.2.4 or newer
  *
  * NOTICE OF LICENSE
  * 
-- 
cgit v1.2.3-24-g4f1b


From e734b38e0f4cde3ebe17cdb1844faa0129fe8b11 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Mon, 26 Mar 2012 13:42:36 +0300
Subject: Clear some spaces and fix some inconsistencies in application/ php
 files

---
 application/errors/error_php.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'application/errors/error_php.php')

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 ?>
-- 
cgit v1.2.3-24-g4f1b


From 09069ddcecde9a0c66e41087e816567d420eb750 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Mon, 14 May 2012 15:21:33 -0400
Subject: Move errors to views folder

---
 application/errors/error_php.php | 55 ----------------------------------------
 1 file changed, 55 deletions(-)
 delete mode 100644 application/errors/error_php.php

(limited to 'application/errors/error_php.php')

diff --git a/application/errors/error_php.php b/application/errors/error_php.php
deleted file mode 100644
index 3855720de..000000000
--- a/application/errors/error_php.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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:
- * 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>
-
-<p>Severity: <?php echo $severity; ?></p>
-<p>Message:  <?php echo $message; ?></p>
-<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
-- 
cgit v1.2.3-24-g4f1b


From a26dea734b9f6606c55921cb29d7e054b714ea57 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Sat, 16 Sep 2017 15:00:12 +0200
Subject: Remove old error template

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 application/errors/error_php.php | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 application/errors/error_php.php

(limited to 'application/errors/error_php.php')

diff --git a/application/errors/error_php.php b/application/errors/error_php.php
deleted file mode 100644
index 5f91e07a0..000000000
--- a/application/errors/error_php.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
-
-<h4>A PHP Error was encountered</h4>
-
-<p>Severity: <?php echo $severity; ?></p>
-<p>Message:  <?php echo $message; ?></p>
-<p>Filename: <?php echo $filepath; ?></p>
-<p>Line Number: <?php echo $line; ?></p>
-
-</div>
-<?php exit();
-- 
cgit v1.2.3-24-g4f1b