From 67b676bd50fb475c3b6c314942be14b4677e426b Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Wed, 9 Oct 2013 14:04:09 +0200
Subject: Sync with ikiwiki 3.20130904.1.

---
 rssitem.tmpl | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'rssitem.tmpl')

diff --git a/rssitem.tmpl b/rssitem.tmpl
index 831daa8..bb03ca5 100644
--- a/rssitem.tmpl
+++ b/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="false"><TMPL_VAR GUID></guid>
 <TMPL_ELSE>
 	<guid isPermaLink="false"><TMPL_VAR URL></guid>
 </TMPL_IF>
 	<link><TMPL_VAR PERMALINK></link>
+<TMPL_IF AUTHOR>
+	<dc:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dc: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>
-- 
cgit v1.2.3