Ensure that email addresses display correctly. The html filter must be applied before the email filter, not after.

This commit is contained in:
zach%zachlipton.com 2005-11-15 23:46:48 +00:00
parent 89064c9e36
commit eddf7e9ed4
4 changed files with 9 additions and 9 deletions

View File

@ -20,8 +20,8 @@ Summary Information
</tr>
<tr class="odd">
<td>Submitted by:</td><td>[% IF result.user.email != "" %]
<a href="mailto:[% result.user.email FILTER email | uri | html %]?subject='Litmus test result submission #[% result.testresult_id | html | uri %]'">
[% result.user.email FILTER email | html%]</a>
<a href="mailto:[% result.user.email FILTER html | uri | email %]?subject='Litmus test result submission #[% result.testresult_id | html | uri %]'">
[% result.user.email FILTER html | email %]</a>
[% ELSE %]
Not provided
[% END %]</td>
@ -131,8 +131,8 @@ You must log in before you can leave comments.
<p><em>------- Comment <a name="c[% comment_num | uri | html %]"
href="#c[% comment_num | uri | html%]">#[% comment_num | html %]</a> From
[% IF comment.user.email %]
<a href="mailto:[% comment.user.email FILTER email | uri | html %]">
[% comment.user.email FILTER email | html %]</a>
<a href="mailto:[% comment.user.email FILTER html | uri | email %]">
[% comment.user.email FILTER html | email %]</a>
[% ELSE %]
Anonymous
[% END %]

View File

@ -11,8 +11,8 @@
[% IF loop.count>1 %]
<hr/>[% END %]<p class='comment'><b>
[% IF comment.user.email %]
<a href=\"mailto:[% comment.user.email FILTER email | html | uri %]\">
[% comment.user.email FILTER email | js | html %]</a>
<a href=\"mailto:[% comment.user.email FILTER html | email | uri %]\">
[% comment.user.email FILTER html | js | email %]</a>
[% ELSE %]
Anonymous[% END %]
<br/>[% comment.submission_time.strftime("%Y-%m-%d&nbsp;%T %Z") %]</b>

View File

@ -2,7 +2,7 @@
<div class="pagetools">
<div>
<h3>Welcome!</h3>
<span class="email"><abbr title="[% defaultemail.email FILTER email | html %]">
<span class="email"><abbr title="[% defaultemail.email FILTER html | email %]">
[% defaultemail.email.replace('\@.*','') %]</abbr></span>
<p align="right"><a href="logout.cgi">Log out</a></p>
<!-- <h3>Log in</h3>

View File

@ -75,8 +75,8 @@ Top Testers
<td align="center">[% loop.count %]</td>
<td align="center">
[% IF curtester.email %]
<a href="mailto:[% curtester.email FILTER email | html | uri %]">
[% curtester.email FILTER email | html %]</a>
<a href="mailto:[% curtester.email FILTER html | uri | email %]">
[% curtester.email FILTER html | email %]</a>
[% ELSE %]Anonymous[% END %]</td>
<td align="center">[% curtester.numtests | html %]</td>
</tr>