From 040d1207101290cf8e8eff3605828adf923f2b1b Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Mon, 11 Jan 2016 14:57:13 +0900
Subject: [PATCH] Move ob_start() from addon script to Context class if using
 delay_session

---
 classes/context/Context.class.php  | 1 +
 modules/addon/addon.controller.php | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 243e831b2..8e59a37d3 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -373,6 +373,7 @@ class Context
 		}
 		else
 		{
+			ob_start();
 			$this->setCacheControl(-1, true);
 			register_shutdown_function(array($this, 'checkSessionStatus'));
 			$_SESSION = array();
diff --git a/modules/addon/addon.controller.php b/modules/addon/addon.controller.php
index d1eb0781a..241d10534 100644
--- a/modules/addon/addon.controller.php
+++ b/modules/addon/addon.controller.php
@@ -80,7 +80,6 @@ class addonController extends addon
 	{
 		// Add-on module for use in creating the cache file
 		$buff = array('<?php if(!defined("__XE__")) exit();', '$_m = Context::get(\'mid\');');
-		$buff[] = 'ob_start();';
 		$oAddonModel = getAdminModel('addon');
 		$addon_list = $oAddonModel->getInsertedAddons($site_srl, $gtype);
 		foreach($addon_list as $addon => $val)
@@ -136,7 +135,6 @@ class addonController extends addon
 			$buff[] = '$addon_time_log->called_extension = "' . $addon . '";';
 			$buff[] = 'writeSlowlog("addon",$after_time-$before_time,$addon_time_log);';
 		}
-		$buff[] = 'ob_end_flush();';
 		$addon_path = _XE_PATH_ . 'files/cache/addons/';
 		FileHandler::makeDir($addon_path);
 		$addon_file = $addon_path . ($gtype == 'site' ? $site_srl : '') . $type . '.acivated_addons.cache.php';