diff options
| author | Fabio Bas <ctrlaltca@gmail.com> | 2017-01-15 21:55:16 +0100 |
|---|---|---|
| committer | Fabio Bas <ctrlaltca@gmail.com> | 2017-01-15 21:55:20 +0100 |
| commit | 0865475b69a8cb69511c2eaf30b36b2a0d4789d8 (patch) | |
| tree | 56853dd031fd4f556ab92dcad0e8d41b0d772271 | |
| parent | b7af81993d8c911726614b0d09ba1d45369030e6 (diff) | |
Fix #625 (prado-3.3 branch)
| -rw-r--r-- | HISTORY | 4 | ||||
| -rw-r--r-- | framework/Web/UI/TTemplateManager.php | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Version 3.3.X in development + +BUG: Issue #625 - The url tag produce an extra directory separator before the result (ctrlaltca) + Version 3.3.2 August 23, 2016 BUG: Issue #592 - Fix TActiveMultiView broken on 3.3.1 (ctrlaltca) diff --git a/framework/Web/UI/TTemplateManager.php b/framework/Web/UI/TTemplateManager.php index b6eddab7..c25e668f 100644 --- a/framework/Web/UI/TTemplateManager.php +++ b/framework/Web/UI/TTemplateManager.php @@ -662,7 +662,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,"rtrim(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("'"=>"\'","\\"=>"\\\\")); @@ -901,7 +901,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,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '/').'/$literal'"); + return array(self::CONFIG_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'"); } } else |