Merge branch 'master' into fancypodcast

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

diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl
index 069ae199719a7b81ec790041e9aace63c1bdbe27..9acefb5d3aab81ac182b2b83e38b7658d458c693 100644 (file)
--- a/templates/rssitem.tmpl
+++ b/templates/rssitem.tmpl
@@ -1,29 +1,28 @@
 <item>
-<TMPL_IF NAME="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 NAME="GUID">
-       <guid isPermaLink="no"><TMPL_VAR GUID></guid>
+<TMPL_IF 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 NAME="CATEGORIES">
-<TMPL_LOOP NAME="CATEGORIES">
+<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>
 </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><TMPL_VAR CONTENT ESCAPE=HTML></description>
 </TMPL_IF>
-<TMPL_IF NAME="COMMENTSURL">
-       <comments><TMPL_VAR NAME="COMMENTSURL"></comments>
+<TMPL_UNLESS SIMPLEPODCAST>
+       <description><TMPL_VAR CONTENT ESCAPE=HTML></description>
+</TMPL_UNLESS>
+<TMPL_IF COMMENTSURL>
+       <comments><TMPL_VAR COMMENTSURL></comments>
 </TMPL_IF>
 </item>