From 86ddc1d43b966307c677aac24729ac4f95a40fc0 Mon Sep 17 00:00:00 2001
From: chschy <chschy@gmail.com>
Date: Tue, 6 Mar 2012 06:53:54 +0000
Subject: [PATCH] issue 785, path config bug of theme

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10337 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/display/HTMLDisplayHandler.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php
index d68d8c84f..60c9cb703 100644
--- a/classes/display/HTMLDisplayHandler.php
+++ b/classes/display/HTMLDisplayHandler.php
@@ -18,10 +18,12 @@ class HTMLDisplayHandler {
 		if(Context::get('module')!='admin' && strpos(Context::get('act'),'Admin') === false){
 			if ($skin && is_string($skin)){
 				$theme_skin = explode('.', $skin);
-				if (count($theme_skin) == 2)
-					$template_path = sprintf('./themes/%s/modules/%s/', $theme_skin[0], $theme_skin[1]);
-				else
-					$template_path = $oModule->getTemplatePath();
+				$template_path = $oModule->getTemplatePath();
+				if (count($theme_skin) == 2) {
+					$theme_path = sprintf('./themes/%s',$theme_skin[0]);
+					if(substr($theme_path,0,strlen($theme_path)) != $theme_path)
+						$template_path = sprintf('%s/modules/%s/', $theme_path, $theme_skin[1]);
+				}	
 			}else{
 				$template_path = $oModule->getTemplatePath();
 			}