mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-04-28 23:03:25 +09:00
Merge branch 'develop' into next
This commit is contained in:
commit
34eb311ac0
4 changed files with 30 additions and 12 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue