Merge branch 'develop' into refactor/functions

This commit is contained in:
Kijin Sung 2016-01-10 13:52:35 +09:00
commit 386e1658a0
5 changed files with 200 additions and 253 deletions

View file

@ -366,14 +366,9 @@ class TemplateHandler
return;
}
$__Context = &$GLOBALS['__Context__'];
$__Context = Context::getInstance();
$__Context->tpl_path = $this->path;
if($_SESSION['is_logged'])
{
$__Context->logged_info = Context::get('logged_info');
}
$level = ob_get_level();
ob_start();
if(substr($buff, 0, 7) == 'file://')