fixed some entities inside CDATA

This commit is contained in:
messju
2004-04-01 16:58:05 +00:00
parent fc53c98a2a
commit 88eb11da47
3 changed files with 23 additions and 25 deletions

View File

@@ -1721,9 +1721,9 @@ index.php:
require('Smarty.class.php'); require('Smarty.class.php');
$smarty = new Smarty; $smarty = new Smarty;
$smarty->assign('data',array(1,2,3,4,5,6,7,8,9)); $smarty->assign('data',array(1,2,3,4,5,6,7,8,9));
$smarty->assign('tr',array('bgcolor="#eeeeee"','bgcolor="#dddddd"')); $smarty->assign('tr',array('bgcolor="#eeeeee"','bgcolor="#dddddd"'));
$smarty->display('index.tpl'); $smarty->display('index.tpl');
index.tpl: index.tpl:
@@ -1733,21 +1733,21 @@ index.tpl:
OUTPUT: OUTPUT:
&lt;table border="1"&gt; <table border="1">
&lt;tr&gt;&lt;td&gt;1&lt;/td&gt;&lt;td&gt;2&lt;/td&gt;&lt;td&gt;3&lt;/td&gt;&lt;/tr&gt; <tr><td>1</td><td>2</td><td>3</td></tr>
&lt;tr&gt;&lt;td&gt;4&lt;/td&gt;&lt;td&gt;5&lt;/td&gt;&lt;td&gt;6&lt;/td&gt;&lt;/tr&gt; <tr><td>4</td><td>5</td><td>6</td></tr>
&lt;tr&gt;&lt;td&gt;7&lt;/td&gt;&lt;td&gt;8&lt;/td&gt;&lt;td&gt;9&lt;/td&gt;&lt;/tr&gt; <tr><td>7</td><td>8</td><td>9</td></tr>
&lt;/table&gt; </table>
&lt;table border="0"&gt; <table border="0">
&lt;tr&gt;&lt;td&gt;1&lt;/td&gt;&lt;td&gt;2&lt;/td&gt;&lt;td&gt;3&lt;/td&gt;&lt;td&gt;4&lt;/td&gt;&lt;/tr&gt; <tr><td>1</td><td>2</td><td>3</td><td>4</td></tr>
&lt;tr&gt;&lt;td&gt;5&lt;/td&gt;&lt;td&gt;6&lt;/td&gt;&lt;td&gt;7&lt;/td&gt;&lt;td&gt;8&lt;/td&gt;&lt;/tr&gt; <tr><td>5</td><td>6</td><td>7</td><td>8</td></tr>
&lt;tr&gt;&lt;td&gt;9&lt;/td&gt;&lt;td&gt;&nbsp;&lt;/td&gt;&lt;td&gt;&nbsp;&lt;/td&gt;&lt;td&gt;&nbsp;&lt;/td&gt;&lt;/tr&gt; <tr><td>9</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
&lt;/table&gt; </table>
&lt;table border="1"&gt; <table border="1">
&lt;tr bgcolor="#eeeeee"&gt;&lt;td&gt;1&lt;/td&gt;&lt;td&gt;2&lt;/td&gt;&lt;td&gt;3&lt;/td&gt;&lt;td&gt;4&lt;/td&gt;&lt;/tr&gt; <tr bgcolor="#eeeeee"><td>1</td><td>2</td><td>3</td><td>4</td></tr>
&lt;tr bgcolor="#dddddd"&gt;&lt;td&gt;5&lt;/td&gt;&lt;td&gt;6&lt;/td&gt;&lt;td&gt;7&lt;/td&gt;&lt;td&gt;8&lt;/td&gt;&lt;/tr&gt; <tr bgcolor="#dddddd"><td>5</td><td>6</td><td>7</td><td>8</td></tr>
&lt;tr bgcolor="#eeeeee"&gt;&lt;td&gt;9&lt;/td&gt;&lt;td&gt;&nbsp;&lt;/td&gt;&lt;td&gt;&nbsp;&lt;/td&gt;&lt;td&gt;&nbsp;&lt;/td&gt;&lt;/tr&gt; <tr bgcolor="#eeeeee"><td>9</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
&lt;/table&gt; </table>
]]></programlisting> ]]></programlisting>
</example> </example>
</sect1> </sect1>

View File

@@ -677,12 +677,11 @@ $smarty->display('index.tpl');
<![CDATA[ <![CDATA[
{$articleTitle} {$articleTitle}
{$articleTitle|escape} {$articleTitle|escape}
{$articleTitle|escape:"html"} {* escapes &amp; &quot; &#039; &lt; &gt; *} {$articleTitle|escape:"html"} {* escapes & " ' < > *}
{$articleTitle|escape:"htmlall"} {* escapes ALL html entities *} {$articleTitle|escape:"htmlall"} {* escapes ALL html entities *}
{$articleTitle|escape:"url"} {$articleTitle|escape:"url"}
{$articleTitle|escape:"quotes"} {$articleTitle|escape:"quotes"}
<a <a href="mailto:{$EmailAddress|escape:"hex"}">{$EmailAddress|escape:"hexentity"}</a>
href="mailto:{$EmailAddress|escape:"hex"}">{$EmailAddress|escape:"hexentity"}</a>
]]> ]]>
</programlisting> </programlisting>
<para> <para>
@@ -696,8 +695,7 @@ href="mailto:{$EmailAddress|escape:"hex"}">{$EmailAddress|escape:"hexentity"}</a
&#039;Stiff Opposition Expected to Casketless Funeral Plan&#039; &#039;Stiff Opposition Expected to Casketless Funeral Plan&#039;
%27Stiff+Opposition+Expected+to+Casketless+Funeral+Plan%27 %27Stiff+Opposition+Expected+to+Casketless+Funeral+Plan%27
\'Stiff Opposition Expected to Casketless Funeral Plan\' \'Stiff Opposition Expected to Casketless Funeral Plan\'
<a <a href="mailto:%62%6f%62%40%6d%65%2e%6e%65%74">&#x62;&#x6f;&#x62;&#x40;&#x6d;&#x65;&#x2e;&#x6e;&#x65;&#x74;</a>
href=&quot;mailto:%62%6f%62%40%6d%65%2e%6e%65%74&quot;&gt;&#x62;&#x6f;&#x62;&#x40;&#x6d;&#x65;&#x2e;&#x6e;&#x65;&#x74;</a>
]]> ]]>
</screen> </screen>
</example> </example>

View File

@@ -158,8 +158,8 @@ zaphod@slartibartfast.com<br />
<title>accessing object properties</title> <title>accessing object properties</title>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
name: {$person-&gt;name}<br /> name: {$person->name}<br />
email: {$person-&gt;email}<br /> email: {$person->email}<br />
]]> ]]>
</programlisting> </programlisting>
<para> <para>