mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-05 09:41:40 +09:00
Fix missing default mobile skin when a board is added in the menu #2510
This commit is contained in:
parent
fb1486ed1e
commit
e072ba0391
2 changed files with 11 additions and 2 deletions
|
|
@ -677,6 +677,8 @@ class MenuAdminController extends Menu
|
||||||
$cmArgs->menu_srl = $request->menu_srl;
|
$cmArgs->menu_srl = $request->menu_srl;
|
||||||
$cmArgs->layout_srl = -1;
|
$cmArgs->layout_srl = -1;
|
||||||
$cmArgs->mlayout_srl = -1;
|
$cmArgs->mlayout_srl = -1;
|
||||||
|
$cmArgs->skin = '/USE_DEFAULT/';
|
||||||
|
$cmArgs->mskin = ModuleModel::getModuleDefaultSkin($cmArgs->module, 'M') ?: '/USE_DEFAULT/';
|
||||||
$cmArgs->is_skin_fix = 'N';
|
$cmArgs->is_skin_fix = 'N';
|
||||||
$cmArgs->is_mskin_fix = 'N';
|
$cmArgs->is_mskin_fix = 'N';
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -986,9 +986,16 @@ class ModuleModel extends Module
|
||||||
if(array_key_exists($moduleName, $installedMenuTypes))
|
if(array_key_exists($moduleName, $installedMenuTypes))
|
||||||
{
|
{
|
||||||
$defaultSkinName = self::getModuleDefaultSkin($module, $dir == 'skins' ? 'P' : 'M');
|
$defaultSkinName = self::getModuleDefaultSkin($module, $dir == 'skins' ? 'P' : 'M');
|
||||||
if(isset($defaultSkinName))
|
if ($defaultSkinName)
|
||||||
{
|
{
|
||||||
$defaultSkinInfo = self::loadSkinInfo($path, $defaultSkinName, $dir);
|
if ($defaultSkinName === '/USE_RESPONSIVE/')
|
||||||
|
{
|
||||||
|
$defaultSkinInfo = (object)array('title' => lang('use_responsive_pc_skin'));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$defaultSkinInfo = self::loadSkinInfo($path, $defaultSkinName, $dir);
|
||||||
|
}
|
||||||
|
|
||||||
$useDefault = new stdClass();
|
$useDefault = new stdClass();
|
||||||
$useDefault->title = lang('use_site_default_skin') . ' (' . ($defaultSkinInfo->title ?? null) . ')';
|
$useDefault->title = lang('use_site_default_skin') . ' (' . ($defaultSkinInfo->title ?? null) . ')';
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue