From e7c74770f021120795e57d0c6f4bf182d21ad0cf Mon Sep 17 00:00:00 2001 From: Brit Butler Date: Wed, 29 Aug 2012 13:19:19 -0400 Subject: [PATCH] Move escaping into RSS template. --- src/feeds.lisp | 8 ++------ themes/hyde/rss.tmpl | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/feeds.lisp b/src/feeds.lisp index 9f83a22..c86b233 100644 --- a/src/feeds.lisp +++ b/src/feeds.lisp @@ -15,10 +15,6 @@ (local-time:now)))) (local-time:format-rfc1123-timestring nil timestamp))) -(defun xml-escape (string) - "Escape the given string for XML." - (format nil "" string)) - (defun render-feed () "Render and write the feed for the site." (let* ((posts (subseq (by-date (hash-table-values *posts*)) 0 10)) @@ -26,8 +22,8 @@ collect (list :title (post-title post) :url (post-url post) :date (make-pubdate (post-date post)) - :tags (mapcar #'xml-escape (post-tags post)) - :content (xml-escape (post-content post)))))) + :tags (post-tags post) + :content (post-content post))))) (render-page "rss.xml" (funcall (theme-fn "RSS") (list :pubdate (make-pubdate) diff --git a/themes/hyde/rss.tmpl b/themes/hyde/rss.tmpl index c3645b8..e09f6c5 100644 --- a/themes/hyde/rss.tmpl +++ b/themes/hyde/rss.tmpl @@ -18,9 +18,9 @@ {$author} {$siteroot}/posts/{$post.url} {foreach $tag in $post.tags} - {$tag |noAutoescape} + {/foreach} - {$post.content |noAutoescape} + {/foreach}