summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2012-09-23 00:08:27 +0200
committerFlorian Pritz <bluewind@xinu.at>2012-09-23 00:08:27 +0200
commit30fee9732b6fcf47b0a09c5a379ae07744b0984a (patch)
tree8ca9acef4c1a2bbb275fe5545520e3f256232825
parent423adc78e9750d82af03bcaaa6561a2d7c6bd5ed (diff)
error_general: Prevent endless loop
If we hit an error in the fancy code it could trigger the same error page being loaded resulting in an endless loop. Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rwxr-xr-xapplication/errors/error_general.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/application/errors/error_general.php b/application/errors/error_general.php
index 4c2554c07..ae2bac76d 100755
--- a/application/errors/error_general.php
+++ b/application/errors/error_general.php
@@ -1,9 +1,9 @@
<?php
// fancy error page only works if we can load helpers
-if (class_exists("CI_Controller") || isset($is_error_page)) {
+if (class_exists("CI_Controller") && !isset($GLOBALS["is_error_page"])) {
$title = "Error";
- $is_error_page = true;
+ $GLOBALS["is_error_page"] = true;
$CI =& get_instance();
$CI->load->helper("filebin");