X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=templates%2Frssitem.tmpl;h=a64a4ebd79273ceac6c62081efee655e40b9c449;hp=c7e587e1c7d6121f2474019d7f649c50f68b7fe7;hb=937b24e0cf98d75dd353d80267efddcecab9e908;hpb=c5919df5f3697e0f8968e2b8f49cd15c1e0aa412

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