fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-29 15:22:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into next

Browse source
This commit is contained in:
Kijin Sung 2020-07-11 11:48:41 +09:00
commit 5f8ceafdf6
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
classes/module/ModuleHandler.class.php
View file

@ -601,7 +601,7 @@ class ModuleHandler extends Handler
Context::addHtmlFooter($footer); Context::addHtmlFooter($footer);
} }
if($type == "view" && $kind != 'admin') if(($type === 'view' || $type === 'mobile') && $kind !== 'admin')
{ {
$domain_info = Context::get('site_module_info'); $domain_info = Context::get('site_module_info');
if ($domain_info && $domain_info->settings && $domain_info->settings->html_header) if ($domain_info && $domain_info->settings && $domain_info->settings->html_header)

2
modules/editor/tpl/admin_index.html
View file

@ -116,7 +116,7 @@
</p> </p>
<p> <p>
<span class="editor_type">{$lang->guide_editor_toolbar}</span> <span class="editor_type">{$lang->guide_editor_toolbar}</span>
<select name="editor_toolbar" style="min-width:104px"> <select name="comment_editor_toolbar" style="min-width:104px">
<option value="default" selected="selected"|cond="!$editor_config->comment_editor_toolbar || $editor_config->comment_editor_toolbar === 'default'">{$lang->editor_toolbar_default}</option> <option value="default" selected="selected"|cond="!$editor_config->comment_editor_toolbar || $editor_config->comment_editor_toolbar === 'default'">{$lang->editor_toolbar_default}</option>
<option value="default" selected="selected"|cond="$editor_config->comment_editor_toolbar === 'simple'">{$lang->editor_toolbar_simple}</option> <option value="default" selected="selected"|cond="$editor_config->comment_editor_toolbar === 'simple'">{$lang->editor_toolbar_simple}</option>
</select> &nbsp; </select> &nbsp;