Merge branch 'develop' into next

This commit is contained in:
Kijin Sung 2020-09-29 00:23:30 +09:00
commit 177a6c6b7d
42 changed files with 98 additions and 74 deletions

View file

@ -67,7 +67,7 @@ class documentView extends document
$obj->content = $content;
$obj->module_srl = ModuleModel::getModuleInfoByMid(Context::get('mid'))->module_srl;
$content = getModel('editor')->converter($obj, 'document');
$content = sprintf('<div class="document_0_%d xe_content">%s</div>', Context::get('logged_info')->member_srl, $content);
$content = sprintf('<div class="document_0_%d rhymix_content xe_content">%s</div>', Context::get('logged_info')->member_srl, $content);
Context::set('content', $content);
$this->setTemplatePath($this->module_path.'tpl');