diff options
| author | ctrlaltca <> | 2013-01-15 18:44:34 +0000 |
|---|---|---|
| committer | ctrlaltca <> | 2013-01-15 18:44:34 +0000 |
| commit | a8bb9a32eebc3a62686dd9bf559bf47a8b1c915b (patch) | |
| tree | 01b4ee0378c1680ca1529e3a3a261c18fae3fe91 | |
| parent | cc486177d7379ddb116cb3a319192befad7fa182 (diff) | |
backported r3251 into trunk/
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | framework/Web/UI/TTemplateManager.php | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -22,6 +22,7 @@ ENH: Issue #426 - Make TDataFieldAccessor capable to access data in nested array BUG: Issue #427 - Var name mismatch in TActiveFileUpload.php (piotr.knapik) BUG: Issue #428 - Using a TActiveCustomValidator with a TActiveTextBox and AutoPostBack does not work as expected (ctrlaltca) BUG: Issue #431 - TReCaptcha does not work well with active controls (Gabor) +BUG: Issue #432 - Double slash with URL Tags in www root (ctrlaltca) EHN: Permit to change the default cipher in TSecurityManager::setEncryption(); changed the default cipher from 3DES to AES256 (ctrlaltca) EHN: Use php's hash_hmac() when available in TSecurityManager, and permit the use of all algorithms supported by php (ctrlaltca) 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 |