You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2007/07/11 16:54:50 UTC
svn commit: r555292 - in /roller/trunk/apps/weblogger/web/WEB-INF/velocity:
deprecated/comments.vm feeds.vm
Author: agilliland
Date: Wed Jul 11 07:54:49 2007
New Revision: 555292
URL: http://svn.apache.org/viewvc?view=rev&rev=555292
Log:
no need to escape and transform comment data in old comments macros or feed macros since all that work is done in the pojo wrapper for us.
Modified:
roller/trunk/apps/weblogger/web/WEB-INF/velocity/deprecated/comments.vm
roller/trunk/apps/weblogger/web/WEB-INF/velocity/feeds.vm
Modified: roller/trunk/apps/weblogger/web/WEB-INF/velocity/deprecated/comments.vm
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/velocity/deprecated/comments.vm?view=diff&rev=555292&r1=555291&r2=555292
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/velocity/deprecated/comments.vm (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/velocity/deprecated/comments.vm Wed Jul 11 07:54:49 2007
@@ -94,18 +94,10 @@
#set( $comments = $model.weblog.getRecentComments($numComments) )
<div class="comments" id="comments">
#foreach( $comment in $comments )
- #set($content = $utils.encodeEmail($comment.content))
- #if($config.commentEscapeHtml)
- #set($content = $utils.escapeHTML($content))
- #end
- #if($config.commentAutoFormat)
- #set($content = $utils.replace($content,"\n","<br />"))
- #end
- #set($content = $utils.addNofollow($content))
<div class="comment" style="border: 1px solid #dadada; padding-left: 3px; padding-right: 5px;" >
<p>Commenting on <a class="entrypermalink"
href="$url.entry($comment.weblogEntry.anchor)">${comment.weblogEntry.title}</a>:</p>
- ${content}
+ $comment.content
#showCommentDetails($comment false)
</div>
#end
Modified: roller/trunk/apps/weblogger/web/WEB-INF/velocity/feeds.vm
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/velocity/feeds.vm?view=diff&rev=555292&r1=555291&r2=555292
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/velocity/feeds.vm (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/velocity/feeds.vm Wed Jul 11 07:54:49 2007
@@ -95,16 +95,7 @@
<link rel="alternate" type="text/html" href="${comment.weblogEntry.permalink}#comment-${comment.timestamp}"/>
<published>$utils.formatIso8601Date($comment.postTime)</published>
<updated>$utils.formatIso8601Date($comment.postTime)</updated>
- #if($config.commentescapeXML)
- #set($content = $utils.escapeXML($utils.removeHTML($comment.content)))
- #else
- #set($content = $utils.escapeXML($utils.transformToHTMLSubset($utils.escapeXML($comment.content))))
- #end
- #if($config.commentAutoFormat)
- #set($content = $utils.autoformat($content))
- #end
- #set($content = $utils.addNofollow($content))
- <content type="html">${content}</content>
+ <content type="html">$comment.content</content>
</entry>
#end
#end
@@ -116,16 +107,7 @@
<title>Re: $utils.escapeXML($comment.weblogEntry.title)</title>
<dc:creator>$utils.escapeXML($utils.removeHTML($comment.name))</dc:creator>
<pubDate>$utils.formatRfc822Date($comment.postTime)</pubDate>
- #if($config.commentescapeXML)
- #set($content = $utils.escapeXML($utils.removeHTML($comment.content)))
- #else
- #set($content = $utils.escapeXML($utils.transformToHTMLSubset($utils.escapeXML($comment.content))))
- #end
- #if($config.commentAutoFormat)
- #set($content = $utils.autoformat($content))
- #end
- #set($content = $utils.addNofollow($content))
- <description>${content}</description>
+ <description>$comment.content</description>
</item>
#end
#end