From f48f2d97a1793103f7c99303c1309c2a22a5a8ca Mon Sep 17 00:00:00 2001 From: xue <> Date: Tue, 6 Mar 2007 19:35:51 +0000 Subject: Fixed template expression bug. --- demos/blog/protected/Layouts/MainLayout.tpl | 2 +- demos/blog/protected/Pages/Posts/ListPost.page | 1 + framework/Web/UI/TTemplateManager.php | 11 +++-------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/demos/blog/protected/Layouts/MainLayout.tpl b/demos/blog/protected/Layouts/MainLayout.tpl index 8e2b1792..1f8b037e 100644 --- a/demos/blog/protected/Layouts/MainLayout.tpl +++ b/demos/blog/protected/Layouts/MainLayout.tpl @@ -1,7 +1,7 @@ - > + > diff --git a/demos/blog/protected/Pages/Posts/ListPost.page b/demos/blog/protected/Pages/Posts/ListPost.page index c3f1ba25..c467190a 100644 --- a/demos/blog/protected/Pages/Posts/ListPost.page +++ b/demos/blog/protected/Pages/Posts/ListPost.page @@ -1,6 +1,7 @@ +
<%= $this->Category->Name %> |<%\\[.*?\\]%>/msS',$value,$matches,PREG_OFFSET_CAPTURE))>0) + if(($n=preg_match_all('/<%[#=].*?%>/msS',$value,$matches,PREG_OFFSET_CAPTURE))>0) { $isDataBind=false; $textStart=0; @@ -869,12 +869,7 @@ class TTemplate extends TApplicationComponent implements ITemplate $isDataBind=true; if($offset>$textStart) $expr.=".'".strtr(substr($value,$textStart,$offset-$textStart),array("'"=>"\\'","\\"=>"\\\\"))."'"; - if($token[2]==='[') // localize - $expr.='.(Prado::localize(\''.strtr(trim(substr($token,3,$length-6)),array("'"=>"\\'","\\"=>"\\\\")).'\'))'; - else if($token[2]==='$') // parameter - $expr.='.(Prado::getApplication()->getParameters()->itemAt(\''.strtr(trim(substr($token,3,$length-5)),array("'"=>"\\'","\\"=>"\\\\")).'\'))'; - else // expression - $expr.='.('.substr($token,3,$length-5).')'; + $expr.='.('.substr($token,3,$length-5).')'; $textStart=$offset+$length; } $length=strlen($value); @@ -1061,4 +1056,4 @@ class TTemplate extends TApplicationComponent implements ITemplate } } -?> +?> \ No newline at end of file -- cgit v1.2.3