diff options
| -rw-r--r-- | demos/blog/protected/Layouts/MainLayout.tpl | 2 | ||||
| -rw-r--r-- | demos/blog/protected/Pages/Posts/ListPost.page | 1 | ||||
| -rw-r--r-- | 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 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >
-<com:THead Title=<%$ SiteName %> >
+<com:THead Title=<%$ SiteTitle %> >
<meta http-equiv="Expires" content="Fri, Jan 01 1900 00:00:00 GMT"/>
<meta http-equiv="Pragma" content="no-cache"/>
<meta http-equiv="Cache-Control" content="no-cache"/>
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 @@ <com:TContent ID="Main">
<com:TPanel ID="CategoryPanel" Visible="false" CssClass="category">
+
<div class="category-name">
<%= $this->Category->Name %>
<com:THyperLink
diff --git a/framework/Web/UI/TTemplateManager.php b/framework/Web/UI/TTemplateManager.php index 1f2bca68..a68b4c51 100644 --- a/framework/Web/UI/TTemplateManager.php +++ b/framework/Web/UI/TTemplateManager.php @@ -854,7 +854,7 @@ class TTemplate extends TApplicationComponent implements ITemplate */
protected function parseAttribute($value)
{
- if(($n=preg_match_all('/<%[#=\\$].*?%>|<%\\[.*?\\]%>/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 |