From 325197e700564f8e4e0ba7c9fc82abfd85f451b0 Mon Sep 17 00:00:00 2001
From: Rick Ellis <rick.ellis@ellislab.com>
Date: Mon, 20 Nov 2006 17:29:05 +0000
Subject:

---
 system/libraries/Exceptions.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'system/libraries/Exceptions.php')

diff --git a/system/libraries/Exceptions.php b/system/libraries/Exceptions.php
index 8f90ff8f9..839093911 100644
--- a/system/libraries/Exceptions.php
+++ b/system/libraries/Exceptions.php
@@ -30,6 +30,7 @@ class CI_Exceptions {
 	var $message;
 	var $filename;
 	var $line;
+	var $ob_level;
 
 	var $levels = array(
 						E_ERROR				=>	'Error',
@@ -53,6 +54,7 @@ class CI_Exceptions {
 	 */	
 	function CI_Exceptions()
 	{
+		$this->ob_level = ob_get_level();
 		// Note:  Do not log messages from this constructor.
 	}
   	
@@ -115,7 +117,7 @@ class CI_Exceptions {
 	{
 		$message = '<p>'.implode('</p><p>', ( ! is_array($message)) ? array($message) : $message).'</p>';
 
-		if (ob_get_level() > 1)
+		if (ob_get_level() > $this->ob_level + 1)
 		{
 			ob_end_flush();	
 		}
@@ -151,7 +153,7 @@ class CI_Exceptions {
 			$filepath = $x[count($x)-2].'/'.end($x);
 		}
 		
-		if (ob_get_level() > 1)
+		if (ob_get_level() > $this->ob_level + 1)
 		{
 			ob_end_flush();	
 		}
-- 
cgit v1.2.3-24-g4f1b