X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/160326b46936d94bd60727112ad31e45360c9ee0..ffa73790b5c381df6e0385995b720dd24188969b:/templates/rssitem.tmpl

diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl
index f22e5e3fb..a61b92b61 100644
--- a/templates/rssitem.tmpl
+++ b/templates/rssitem.tmpl
@@ -5,7 +5,11 @@
 	<TMPL_ELSE>
 	<title><TMPL_VAR TITLE></title>
 	</TMPL_IF>
-	<guid><TMPL_VAR URL></guid>
+	<TMPL_IF NAME="GUID">
+	  <guid isPermaLink="no"><TMPL_VAR GUID></guid>
+	<TMPL_ELSE>
+	  <guid><TMPL_VAR URL></guid>
+	</TMPL_IF>
 	<link><TMPL_VAR PERMALINK></link>
 	<TMPL_IF NAME="CATEGORIES">
 	<TMPL_LOOP NAME="CATEGORIES">
@@ -17,6 +21,9 @@
 	<TMPL_IF NAME="ENCLOSURE">
 	<enclosure url="<TMPL_VAR ENCLOSURE>" type="<TMPL_VAR TYPE>" length="<TMPL_VAR LENGTH>" />
 	<TMPL_ELSE>
-	<description><![CDATA[<TMPL_VAR CONTENT>]]></description>
+	<description><TMPL_VAR CONTENT ESCAPE=HTML></description>
+	</TMPL_IF>
+	<TMPL_IF NAME="COMMENTSURL">
+	<comments><TMPL_VAR NAME="COMMENTSURL"></comments>
 	</TMPL_IF>
 </item>