commit 2804b8d06e18901163546243e1f53dc3e4715df5
author David M. Johnson <snoopdave@apache.org> Fri Apr 13 20:25:36 2007 +0000
committer David M. Johnson <snoopdave@apache.org> Fri Apr 13 20:25:36 2007 +0000
tree 53c329509aba9e7252b91bcb561205448736bf98
parent 8b6a70bda3e1807f0b0ae93fc93d0f636362b002

escaping in legacy macros

git-svn-id: https://svn.apache.org/repos/asf/roller/branches/roller_2.3@528644 13f79535-47bb-0310-9956-ffa450edef68

web/WEB-INF/classes/comments.vm

diff --git a/web/WEB-INF/classes/comments.vm b/web/WEB-INF/classes/comments.vm
index 616c3d9..f4b9028 100644
--- a/web/WEB-INF/classes/comments.vm
+++ b/web/WEB-INF/classes/comments.vm
@@ -128,9 +128,11 @@
         #set($content = $utilities.encodeEmail($comment.content))
         #if($escapeHtml)
             #set($content = $utilities.escapeHTML($content))
+        #else 
+            #set($content = $utilities.transformToHTMLSubset($utilities.escapeHTML($content)))
         #end
         #if($autoformat)
-            #set($content = $stringUtils.replace($content,"\n","<br />"))
+            #set($content = $utilities.autoformat($content))
         #end
         #set($content = $utilities.addNofollow($content))
         <div class="comment" style="border: 1px solid #dadada; padding-left: 3px; padding-right: 5px;" >