From a8bb9a32eebc3a62686dd9bf559bf47a8b1c915b Mon Sep 17 00:00:00 2001
From: ctrlaltca <>
Date: Tue, 15 Jan 2013 18:44:34 +0000
Subject: backported r3251 into trunk/

---
 framework/Web/UI/TTemplateManager.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'framework/Web/UI')

diff --git a/framework/Web/UI/TTemplateManager.php b/framework/Web/UI/TTemplateManager.php
index f884cd65..c2f4991b 100644
--- a/framework/Web/UI/TTemplateManager.php
+++ b/framework/Web/UI/TTemplateManager.php
@@ -665,7 +665,7 @@ class TTemplate extends TApplicationComponent implements ITemplate
 					else if($str[2]==='~')
 						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"\$this->publishFilePath('$this->_contextPath/$literal')"));
 					else if($str[2]==='/')
-						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"dirname(\$this->getApplication()->getRequest()->getApplicationUrl()).'/$literal'"));
+						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '/').'/$literal'"));
 					else if($str[2]==='[')
 					{
 						$literal=strtr(trim(substr($literal,0,strlen($literal)-1)),array("'"=>"\'","\\"=>"\\\\"));
@@ -904,7 +904,7 @@ class TTemplate extends TApplicationComponent implements ITemplate
 				return array(self::CONFIG_PARAMETER,trim(substr($value,3,strlen($value)-5)));
 			elseif($value[2]==='/') {
 				$literal = trim(substr($value,3,strlen($value)-5));
-				return array(self::CONFIG_EXPRESSION,"dirname(\$this->getApplication()->getRequest()->getApplicationUrl()).'/$literal'");
+				return array(self::CONFIG_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '/').'/$literal'");
 			}
 		}
 		else
-- 
cgit v1.2.3