From e2928534c576b0347b0f7dd94244b7220688a1ed Mon Sep 17 00:00:00 2001
From: Changwan Jun <me@wani.kr>
Date: Tue, 26 May 2015 14:57:42 +0900
Subject: [PATCH] ob_start * bug fix.

---
 classes/template/TemplateHandler.class.php | 8 +++++++-
 modules/page/page.view.php                 | 9 +++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php
index b2d148759..d774a2633 100644
--- a/classes/template/TemplateHandler.class.php
+++ b/classes/template/TemplateHandler.class.php
@@ -362,6 +362,7 @@ class TemplateHandler
 			$__Context->logged_info = Context::get('logged_info');
 		}
 
+		$level = ob_get_level();
 		ob_start();
 		if(substr($buff, 0, 7) == 'file://')
 		{
@@ -395,7 +396,12 @@ class TemplateHandler
 			}
 		}
 
-		return ob_get_clean();
+		$contents = '';
+		while (ob_get_level() - $level > 0) {
+			$contents .= ob_get_contents();
+			ob_end_clean();
+		}
+		return $contents;
 	}
 
 	/**
diff --git a/modules/page/page.view.php b/modules/page/page.view.php
index c07a50124..4ecf25774 100644
--- a/modules/page/page.view.php
+++ b/modules/page/page.view.php
@@ -179,6 +179,7 @@ class pageView extends page
 		$filepath = preg_replace('/'.$filename."$/i","",$cache_file);
 		$cache_file = FileHandler::getRealPath($cache_file);
 
+		$level = ob_get_level();
 		// Verify cache
 		if($caching_interval <1 || !file_exists($cache_file) || filemtime($cache_file) + $caching_interval*60 <= $_SERVER['REQUEST_TIME'] || filemtime($cache_file)<filemtime($target_file))
 		{
@@ -208,9 +209,13 @@ class pageView extends page
 
 		ob_start();
 		include($cache_file);
-		$content = ob_get_clean();
 
-		return $content;
+		$contents = '';
+		while (ob_get_level() - $level > 0) {
+			$contents .= ob_get_contents();
+			ob_end_clean();
+		}
+		return $contents;
 	}
 
 	function _replacePath($matches)