fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-03 09:14:48 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:rhymix/rhymix into pr/notify-block

Browse source
This commit is contained in:
BJRambo 2020-02-04 12:14:43 +09:00
commit 42271b2e3b
12 changed files with 137 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/document/document.view.php
View file

@ -73,7 +73,7 @@ class documentView extends document
$obj->content = $content;
$obj->module_srl = getModel('module')->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);
Context::set('content', $content);
$this->setTemplatePath($this->module_path.'tpl');

4
modules/editor/editor.model.php
View file

@ -276,7 +276,7 @@ class editorModel extends editor
// Convert configuration keys according to type (document or comment).
if($type == 'document')
{
foreach (get_object_vars($editor_config) as $key => $val)
foreach ((array)$editor_config as $key => $val)
{
$option->$key = $val;
}
@ -290,7 +290,7 @@ class editorModel extends editor
}
else
{
foreach (get_object_vars($editor_config) as $key => $val)
foreach ((array)$editor_config as $key => $val)
{
$option->$key = $val;
}

2
modules/file/file.model.php
View file

@ -403,7 +403,7 @@ class fileModel extends file
function getUploadConfig()
{
$config = $this->getFileConfig(Context::get('module_srl') ?: Context::get('current_module_info')->module_srl);
if($this->user->isAdmin())
if($this->user->is_admin === 'Y')
{
$module_config = getModel('module')->getModuleConfig('file');
$config->allowed_filesize = max($config->allowed_filesize, $module_config->allowed_filesize);