From 2d542abe32a5c8a5c228b9788abcb51d4b804da4 Mon Sep 17 00:00:00 2001 From: flyskyko Date: Fri, 26 Oct 2012 06:43:29 +0000 Subject: [PATCH] added a 'no_skin' flag on getMenuAdminInstalledMenuType git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11917 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/menu/menu.admin.model.php | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/modules/menu/menu.admin.model.php b/modules/menu/menu.admin.model.php index c067ba461..741dace68 100644 --- a/modules/menu/menu.admin.model.php +++ b/modules/menu/menu.admin.model.php @@ -276,7 +276,7 @@ */ function getMenuAdminInstalledMenuType() { - $this->add('menu_types', $this->getModuleListInSitemap()); + $this->add('menu_types', $this->getModuleListInSitemap(0, Context::get('no_skin'))); } /** @@ -285,7 +285,7 @@ * @param int $site_srl * @return array */ - function getModuleListInSitemap($site_srl = 0) + function getModuleListInSitemap($site_srl = 0, $noSkin = 'N') { $oModuleModel = &getModel('module'); $columnList = array('module'); @@ -321,16 +321,20 @@ $pageTypeName = Context::getLang('page_type_name'); $moduleInfo->title = $pageTypeName['ARTICLE']; $moduleInfoList['ARTICLE'] = $moduleInfo; - $wModuleInfo = clone $moduleInfo; - unset($wModuleInfo->default_skin); - unset($wModuleInfo->default_mskin); - $wModuleInfo->title = $pageTypeName['WIDGET']; - $moduleInfoList['WIDGET'] = $wModuleInfo; - $oModuleInfo = clone $moduleInfo; - unset($oModuleInfo->default_skin); - unset($oModuleInfo->default_mskin); - $oModuleInfo->title = $pageTypeName['OUTSIDE']; - $moduleInfoList['OUTSIDE'] = $oModuleInfo; + + if($noSkin != 'Y') + { + $wModuleInfo = clone $moduleInfo; + unset($wModuleInfo->default_skin); + unset($wModuleInfo->default_mskin); + $wModuleInfo->title = $pageTypeName['WIDGET']; + $moduleInfoList['WIDGET'] = $wModuleInfo; + $oModuleInfo = clone $moduleInfo; + unset($oModuleInfo->default_skin); + unset($oModuleInfo->default_mskin); + $oModuleInfo->title = $pageTypeName['OUTSIDE']; + $moduleInfoList['OUTSIDE'] = $oModuleInfo; + } } else {