diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php
index 594f27086..3a416a712 100644
--- a/classes/module/ModuleObject.class.php
+++ b/classes/module/ModuleObject.class.php
@@ -341,7 +341,8 @@
// integrate skin information of the module(change to sync skin info with the target module only by seperating its table)
$is_default_skin = ((!Mobile::isFromMobilePhone() && $this->module_info->is_skin_fix == 'N') || (Mobile::isFromMobilePhone() && $this->module_info->is_mskin_fix == 'N'));
- if($is_default_skin && $this->module != 'admin' && strpos($this->act, 'Admin') === false)
+ $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)
{
$dir = (Mobile::isFromMobilePhone()) ? 'm.skins' : 'skins';
$oModuleModel = getModel('module');
diff --git a/modules/menu/menu.admin.model.php b/modules/menu/menu.admin.model.php
index 6a4c9022d..c067ba461 100644
--- a/modules/menu/menu.admin.model.php
+++ b/modules/menu/menu.admin.model.php
@@ -322,9 +322,13 @@
$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;
}
diff --git a/modules/page/lang/lang.xml b/modules/page/lang/lang.xml
index 9b3928547..f00f36c25 100644
--- a/modules/page/lang/lang.xml
+++ b/modules/page/lang/lang.xml
@@ -11,6 +11,10 @@
+ -
+
+
+
-
{$oDocument->getTitle()}
{$oDocument->getContent($module_info->display_popupmenu != 'hide')}
+
+
+{$lang->none_content}
+