Merge pull request #37 from kijin/fix/context-static-this

Context 클래스의 일관성 없는 static 사용을 정리
This commit is contained in:
Kijin Sung 2016-01-10 13:50:13 +09:00
commit 4237a78aa8
2 changed files with 180 additions and 243 deletions

File diff suppressed because it is too large Load diff

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://')