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

Merge branch 'develop' into next

Browse source
This commit is contained in:
Kijin Sung 2020-08-29 23:53:31 +09:00
commit ffe9cda5e0
37 changed files with 2047 additions and 1931 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/menu/menu.admin.model.php
View file

@ -326,6 +326,9 @@ class menuAdminModel extends menu
Context::loadLang('modules/page/lang');
$oAutoinstallAdminModel = getAdminModel('autoinstall');
$config = $oAutoinstallAdminModel->getAutoInstallAdminModuleConfig();
foreach($_allModules as $module_name)
{
$module = $oModuleModel->getModuleInfoXml($module_name);
@ -345,9 +348,8 @@ class menuAdminModel extends menu
$module->defaultMobileSkin = new stdClass();
$module->defaultMobileSkin->skin = $defaultMobileSkin;
$module->defaultMobileSkin->title = $mobileSkinInfo->title ? $mobileSkinInfo->title : $defaultMobileSkin;
$module->package_srl = $oAutoinstallModel->getPackageSrlByPath('./modules/' . $module_name);
$module->url = _XE_LOCATION_SITE_ . '?mid=download&package_srl=' . $module->package_srl;
$module->url = $config->location_site . '?mid=download&package_srl=' . $module->package_srl;
if($module_name == 'page')
{