Merge branch 'master' into fancypodcast

[git.ikiwiki.info.git] / templates / rssitem.tmpl

diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl
index a64a4ebd79273ceac6c62081efee655e40b9c449..9acefb5d3aab81ac182b2b83e38b7658d458c693 100644 (file)
--- a/templates/rssitem.tmpl
+++ b/templates/rssitem.tmpl
@@ -1,16 +1,14 @@
 <item>
-<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>
+       <guid isPermaLink="false"><TMPL_VAR GUID></guid>
 <TMPL_ELSE>
-       <guid><TMPL_VAR URL></guid>
+       <guid isPermaLink="false"><TMPL_VAR URL></guid>
 </TMPL_IF>
        <link><TMPL_VAR PERMALINK></link>
+<TMPL_IF AUTHOR>
+       <dcterms:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dcterms:creator>
+</TMPL_IF>
 <TMPL_IF CATEGORIES>
 <TMPL_LOOP CATEGORIES>
        <category><TMPL_VAR CATEGORY></category>
@@ -20,9 +18,10 @@
        <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_UNLESS SIMPLEPODCAST>
+       <description><TMPL_VAR CONTENT ESCAPE=HTML></description>
+</TMPL_UNLESS>
 <TMPL_IF COMMENTSURL>
        <comments><TMPL_VAR COMMENTSURL></comments>
 </TMPL_IF>