Index: trunk/core/kernel/parser/template.php
===================================================================
diff -u -r1560 -r2374
--- trunk/core/kernel/parser/template.php	(.../template.php)	(revision 1560)
+++ trunk/core/kernel/parser/template.php	(.../template.php)	(revision 2374)
@@ -83,14 +83,13 @@
 	function SetThemePath()
 	{
 		if ( defined('SPECIAL_TEMPLATES_FOLDER') ) {
-			safeDefine( 'THEMES_PATH', preg_replace('/'.preg_quote(DOC_ROOT.BASE_PATH, '/').'/i','',str_replace('\\', '/', FULL_PATH)). SPECIAL_TEMPLATES_FOLDER );
+			safeDefine( 'THEMES_PATH', preg_replace('/'.preg_quote(rtrim(DOC_ROOT.BASE_PATH, '/'), '/').'/i','',str_replace('\\', '/', FULL_PATH)). SPECIAL_TEMPLATES_FOLDER );
 		}
 		else {
-			
 			$current_theme = $this->Application->GetVar('m_theme');
 			$folder = $this->Application->DB->GetOne('SELECT Name FROM '.TABLE_PREFIX.'Theme WHERE ThemeId = '.$current_theme);
 			
-			safeDefine( 'THEMES_PATH', preg_replace('/'.preg_quote(DOC_ROOT.BASE_PATH, '/').'/i','',str_replace('\\', '/', FULL_PATH)). ( defined('ADMIN') ? '/admin/templates' : '/themes/'.$folder));
+			safeDefine( 'THEMES_PATH', preg_replace('/'.preg_quote(rtrim(DOC_ROOT.BASE_PATH, '/'), '/').'/i','',str_replace('\\', '/', FULL_PATH)). ( defined('ADMIN') ? '/admin/templates' : '/themes/'.$folder));
 		}
 	}