fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-06 10:11:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse source
This commit is contained in:
Kijin Sung 2021-03-05 13:57:12 +09:00
commit a93a6097a7
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/communication/communication.view.php
View file

@ -272,6 +272,10 @@ class communicationView extends communication
$option->editor_skin = $this->config->editor_skin;
$option->sel_editor_colorset = $this->config->editor_colorset;
$option->editor_focus = Context::get('source_message') ? 'Y' : 'N';
if(Context::get('m'))
{
$option->editor_toolbar_hide = 'Y';
}
$editor = $oEditorModel->getEditor(getNextSequence(), $option);
$editor = $editor . "\n" . '<input type="hidden" name="temp_srl" value="" />' . "\n";
Context::set('editor', $editor);

3
modules/widget/widget.model.php
View file

@ -318,7 +318,8 @@ class widgetModel extends widget
$buff[] = sprintf('$widgetStyle_info->license_link = %s;', var_export($xml_obj->license->attrs->link, true));
// preview
if(!$xml_obj->preview->body) $xml_obj->preview->body = 'preview.jpg';
if(!isset($xml_obj->preview)) $xml_obj->preview = new stdClass;
if(!isset($xml_obj->preview->body) || !$xml_obj->preview->body) $xml_obj->preview->body = 'preview.jpg';
$preview_file = sprintf("%s%s", $widgetStyle_path,$xml_obj->preview->body);
if(file_exists($preview_file)) $buff[] = sprintf('$widgetStyle_info->preview = %s;', var_export($preview_file, true));