Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patch-2
diff --git a/application/errors/error_php.php b/application/errors/error_php.php
index f085c20..cf6cb9f 100644
--- a/application/errors/error_php.php
+++ b/application/errors/error_php.php
@@ -6,5 +6,16 @@
<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 ?>
+ <? endforeach ?></p>
+<?php endif ?>
</div>
\ No newline at end of file
diff --git a/index.php b/index.php
index c50cfed..312fbfb 100644
--- a/index.php
+++ b/index.php
@@ -34,6 +34,7 @@
{
case 'development':
error_reporting(-1);
+ define('SHOW_ERROR_BACKTRACE', TRUE);
break;
case 'testing':
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index bbf2ec7..8b74fa9 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -9,6 +9,7 @@
- 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