[icinga-checkins] icinga.org: icinga-web/mfriedrich/fixes: * Fixed updated agavi (#fixes 1307 )

git at icinga.org git at icinga.org
Wed Mar 30 11:14:02 CEST 2011


Module: icinga-web
Branch: mfriedrich/fixes
Commit: 9cb9e502bd644cb070c4b76018a8e08134a826fa
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=9cb9e502bd644cb070c4b76018a8e08134a826fa

Author: jmosshammer <jannis.mosshammer at netways.de>
Date:   Sun Mar 20 11:27:52 2011 +0100

* Fixed updated agavi (#fixes 1307)

---

 lib/agavi/src/exception/AgaviException.class.php |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/agavi/src/exception/AgaviException.class.php b/lib/agavi/src/exception/AgaviException.class.php
index 5912c3e..cb85f41 100644
--- a/lib/agavi/src/exception/AgaviException.class.php
+++ b/lib/agavi/src/exception/AgaviException.class.php
@@ -286,8 +286,9 @@ class AgaviException extends Exception
 		}
 		
 		// discard any previous output waiting in the buffer
-		while(@ob_end_clean());
-		
+		if(ob_get_length()) {
+			while(@ob_end_clean());
+		}
 		if($container !== null && $container->getOutputType() !== null && $container->getOutputType()->getExceptionTemplate() !== null) { 
 			// an exception template was defined for the container's output type
 			include($container->getOutputType()->getExceptionTemplate()); 
@@ -320,4 +321,4 @@ class AgaviException extends Exception
 	}
 }
 
-?>
\ No newline at end of file
+?>





More information about the icinga-checkins mailing list