Merge branch 'develop' into next

This commit is contained in:
Kijin Sung 2020-05-26 09:00:15 +09:00
commit 34eb311ac0
4 changed files with 30 additions and 12 deletions

View file

@ -40,6 +40,7 @@ class pointView extends point
$module_config = ModuleModel::getModulePartConfig('point', $current_module_srl);
if(!$module_config)
{
$module_config = array();
$module_config['insert_document'] = $config->insert_document;
$module_config['insert_comment'] = $config->insert_comment;
$module_config['upload_file'] = $config->upload_file;
@ -50,6 +51,10 @@ class pointView extends point
$module_config['voted_comment'] = $config->voted_comment;
$module_config['blamed_comment'] = $config->blamed_comment;
}
elseif(is_object($module_config))
{
$module_config = get_object_vars($module_config);
}
}
$module_config['module_srl'] = $current_module_srl;