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

Support /USE_RESPONSIVE/ as a valid mobile skin option

Browse source
This commit is contained in:
Kijin Sung 2017-07-01 20:25:41 +09:00
parent dae2e9c2d8
commit 7904304dc3
5 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
classes/module/ModuleObject.class.php
View file

@ -557,14 +557,14 @@ class ModuleObject extends Object
}
// integrate skin information of the module(change to sync skin info with the target module only by seperating its table)
$oModuleModel = getModel('module');
$is_default_skin = ((!Mobile::isFromMobilePhone() && $this->module_info->is_skin_fix == 'N') || (Mobile::isFromMobilePhone() && $this->module_info->is_mskin_fix == 'N'));
$usedSkinModule = !($this->module == 'page' && ($this->module_info->page_type == 'OUTSIDE' || $this->module_info->page_type == 'WIDGET'));
if($usedSkinModule && $is_default_skin && $this->module != 'admin' && strpos($this->act, 'Admin') === false && $this->module == $this->module_info->module)
{
$dir = (Mobile::isFromMobilePhone()) ? 'm.skins' : 'skins';
$valueName = (Mobile::isFromMobilePhone()) ? 'mskin' : 'skin';
$oModuleModel = getModel('module');
$skinType = (Mobile::isFromMobilePhone()) ? 'M' : 'P';
$skinType = (Mobile::isFromMobilePhone() && $this->module_info->mskin !== '/USE_RESPONSIVE/') ? 'M' : 'P';
$dir = $skinType === 'M' ? 'm.skins' : 'skins';
$valueName = $skinType === 'M' ? 'mskin' : 'skin';
$skinName = $oModuleModel->getModuleDefaultSkin($this->module, $skinType);
if($this->module == 'page')
{
@ -580,7 +580,6 @@ class ModuleObject extends Object
}
}
$oModuleModel = getModel('module');
$oModuleModel->syncSkinInfoToModuleInfo($this->module_info);
Context::set('module_info', $this->module_info);
// Run