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(-)

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(-)

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 233b671f0f704ad75685ef9845ae9267643dd77d Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Thu, 13 Oct 2011 11:56:44 -0300
Subject: Added backtrace contstant

---
 index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/index.php b/index.php
index c50cfed43..312fbfb1d 100644
--- a/index.php
+++ b/index.php
@@ -34,6 +34,7 @@ if (defined('ENVIRONMENT'))
 	{
 		case 'development':
 			error_reporting(-1);
+			define('SHOW_ERROR_BACKTRACE', TRUE);
 		break;
 	
 		case 'testing':
-- 
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(-)

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 2d096c0339f1cef810cc74e93f4d0633ee8e215f Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Mon, 17 Oct 2011 12:24:56 -0400
Subject: Added changelog item

---
 user_guide_src/source/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 3e1643524..0b12d758c 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -8,7 +8,7 @@ Version 2.1.0 (planned)
 Release Date: Not Released
 
 -  General Changes
-
+   -  Added an optional backtrace to php-error template
    -  Added Android to the list of user agents.
    -  Added Windows 7 to the list of user platforms.
    -  Callback validation rules can now accept parameters like any other
-- 
cgit v1.2.3-24-g4f1b


From deb65968c2be11b72f1072d5fd840edd1da031dd Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Mon, 17 Oct 2011 12:26:02 -0400
Subject: Added changelog item

---
 user_guide_src/source/changelog.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 0b12d758c..e4c318f43 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -8,7 +8,8 @@ Version 2.1.0 (planned)
 Release Date: Not Released
 
 -  General Changes
-   -  Added an optional backtrace to php-error template
+
+   -  Added an optional backtrace to php-error template,
    -  Added Android to the list of user agents.
    -  Added Windows 7 to the list of user platforms.
    -  Callback validation rules can now accept parameters like any other
-- 
cgit v1.2.3-24-g4f1b


From 52aff71bac8bf93eff797e35d875334ebd3585a0 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Mon, 17 Oct 2011 12:26:56 -0400
Subject: Added changelog item

---
 user_guide_src/source/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index e4c318f43..97e949542 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -9,7 +9,7 @@ Release Date: Not Released
 
 -  General Changes
 
-   -  Added an optional backtrace to php-error template,
+   -  Added an optional backtrace to php-error template.
    -  Added Android to the list of user agents.
    -  Added Windows 7 to the list of user platforms.
    -  Callback validation rules can now accept parameters like any other
-- 
cgit v1.2.3-24-g4f1b


From 9a902cb3b9cb9e6133c42aa047f410ed4f6dcdf1 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Tue, 18 Oct 2011 04:06:29 -0400
Subject: Moved backtrace constant to config/constants.php

---
 application/config/constants.php | 12 ++++++++++++
 index.php                        |  1 -
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/application/config/constants.php b/application/config/constants.php
index 4a879d360..fcf1aae89 100644
--- a/application/config/constants.php
+++ b/application/config/constants.php
@@ -36,6 +36,18 @@ define('FOPEN_READ_WRITE_CREATE',				'a+b');
 define('FOPEN_WRITE_CREATE_STRICT',				'xb');
 define('FOPEN_READ_WRITE_CREATE_STRICT',		'x+b');
 
+/*
+|--------------------------------------------------------------------------
+| Display Debug backtrace
+|--------------------------------------------------------------------------
+|
+| If set to true, a backtrace will be displayed along with php errors. If 
+| error_reporting is disabled, the backtrace will not display, regardless 
+| of this setting
+|
+*/
+define('SHOW_ERROR_BACKTRACE', TRUE);
+
 
 /* End of file constants.php */
 /* Location: ./application/config/constants.php */
\ No newline at end of file
diff --git a/index.php b/index.php
index 312fbfb1d..c50cfed43 100644
--- a/index.php
+++ b/index.php
@@ -34,7 +34,6 @@ if (defined('ENVIRONMENT'))
 	{
 		case 'development':
 			error_reporting(-1);
-			define('SHOW_ERROR_BACKTRACE', TRUE);
 		break;
 	
 		case 'testing':
-- 
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/config/constants.php |  2 +-
 application/errors/error_php.php | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/application/config/constants.php b/application/config/constants.php
index fcf1aae89..f41f86b74 100644
--- a/application/config/constants.php
+++ b/application/config/constants.php
@@ -41,7 +41,7 @@ define('FOPEN_READ_WRITE_CREATE_STRICT',		'x+b');
 | Display Debug backtrace
 |--------------------------------------------------------------------------
 |
-| If set to true, a backtrace will be displayed along with php errors. If 
+| If set to TRUE, a backtrace will be displayed along with php errors. If 
 | error_reporting is disabled, the backtrace will not display, regardless 
 | of this setting
 |
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(+)

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/config/constants.php | 2 +-
 application/errors/error_php.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/config/constants.php b/application/config/constants.php
index f41f86b74..ee177f5ad 100644
--- a/application/config/constants.php
+++ b/application/config/constants.php
@@ -46,7 +46,7 @@ define('FOPEN_READ_WRITE_CREATE_STRICT',		'x+b');
 | of this setting
 |
 */
-define('SHOW_ERROR_BACKTRACE', TRUE);
+define('SHOW_DEBUG_BACKTRACE', TRUE);
 
 
 /* End of file constants.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