From 8d4f84ec1f9f532a0b70acb05bc9f1774b5896ad Mon Sep 17 00:00:00 2001
From: devjin <namnyams@gmail.com>
Date: Sun, 4 Nov 2012 08:41:16 +0000
Subject: [PATCH] issue 2370 add a default skin value.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12102 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/module/module.model.php | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index db2770a27..3eeff5cb5 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -1424,21 +1424,37 @@
 
 			if(!$skinName)
 			{
-				$dir = ($skin_type == 'M') ? 'm.skins/' : 'skins';
+				$dir = ($skin_type == 'M') ? 'm.skins/' : 'skins/';
 				$moduleSkinPath = ModuleHandler::getModulePath($module_name).$dir;
-				$skins = FileHandler::readDir($moduleSkinPath);
-				if(count($skins) > 0)
+
+				if(is_dir($moduleSkinPath.'default'))
+				{
+					$skinName = 'default';
+				}
+				else if(is_dir($moduleSkinPath.'xe_default'))
+				{
+					$skinName = 'xe_default';
+				}
+				else
+				{
+					$skins = FileHandler::readDir($moduleSkinPath);
+					if(count($skins) > 0)
+					{
+						$skinName = $skins[0];
+					}
+					else
+					{
+						$skinName = NULL;
+					}
+				}
+
+				if($skinName)
 				{
-					$skinName = $skins[0];
 					$designInfo->module->{$module_name}->{$target} = $skinName;
 
 					$oAdminController = getAdminController('admin');
 					$oAdminController->makeDefaultDesignFile($designInfo, $site_srl);
 				}
-				else
-				{
-					$skinName = NULL;
-				}
 			}
 
 			return $skinName;