Index: trunk/kernel/include/theme.php
===================================================================
diff -u -r1888 -r3000
--- trunk/kernel/include/theme.php	(.../theme.php)	(revision 1888)
+++ trunk/kernel/include/theme.php	(.../theme.php)	(revision 3000)
@@ -48,12 +48,14 @@
         // need to rewrite (by Alex)
         global $objConfig, $pathchar,$pathtoroot;
 
-        $path = $pathtoroot."themes".$pathchar.$this->ThemeRoot();
-        if(strlen(trim($this->Get("FilePath"))))
-            $path .= $pathchar.$this->Get("FilePath");
-        $path .= $pathchar.$this->Get("FileName");
+        $template_path = Array();
+        $template_path[] = FULL_PATH.'/themes/'.$this->ThemeRoot();
+        $sub_folder = trim( $this->Get('FilePath'), ' /');
+        if($sub_folder) $template_path[] = $sub_folder;
+        $template_path[] = trim( $this->Get('FileName'), '/');
+
         //echo "Full Path is $path <br>\n";
-        return str_replace('//','/',$path);
+        return implode('/', $template_path);
     }
     
     function Get($name)
@@ -168,7 +170,7 @@
     {
 
     	$path = $this->FullPath();
-        $path = str_replace('//','/',$path);
+//        $path = str_replace('//','/',$path);
         $ret = $new_file ? is_writable(dirname($path)): is_writable($path);
 
         if(!$ret)