From 30fee9732b6fcf47b0a09c5a379ae07744b0984a Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Sun, 23 Sep 2012 00:08:27 +0200
Subject: 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>
---
 application/errors/error_general.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

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");
-- 
cgit v1.2.3-24-g4f1b