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

diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl
index f22e5e3fb..a64a4ebd7 100644
--- a/templates/rssitem.tmpl
+++ b/templates/rssitem.tmpl
@@ -1,22 +1,29 @@
 <item>
-	<TMPL_IF NAME="AUTHOR">
+<TMPL_IF AUTHOR>
 	<title><TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE></title>
 	<dcterms:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dcterms:creator>
-	<TMPL_ELSE>
+<TMPL_ELSE>
 	<title><TMPL_VAR TITLE></title>
-	</TMPL_IF>
+</TMPL_IF>
+<TMPL_IF 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">
+<TMPL_IF CATEGORIES>
+<TMPL_LOOP CATEGORIES>
 	<category><TMPL_VAR CATEGORY></category>
-	</TMPL_LOOP>
-	</TMPL_IF>
+</TMPL_LOOP>
+</TMPL_IF>
 	<pubDate><TMPL_VAR CDATE_822></pubDate>
 	<dcterms:modified><TMPL_VAR MDATE_3339></dcterms:modified>
-	<TMPL_IF NAME="ENCLOSURE">
+<TMPL_IF ENCLOSURE>
 	<enclosure url="<TMPL_VAR ENCLOSURE>" type="<TMPL_VAR TYPE>" length="<TMPL_VAR LENGTH>" />
-	<TMPL_ELSE>
-	<description><![CDATA[<TMPL_VAR CONTENT>]]></description>
-	</TMPL_IF>
+<TMPL_ELSE>
+	<description><TMPL_VAR CONTENT ESCAPE=HTML></description>
+</TMPL_IF>
+<TMPL_IF COMMENTSURL>
+	<comments><TMPL_VAR COMMENTSURL></comments>
+</TMPL_IF>
 </item>