From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Thu, 31 Jul 2008 21:12:56 +0000 (+0100)
Subject: Escape HTML in Atom feeds, rather than relying on it being well-formed XHTML with... 
X-Git-Tag: 2.56~5^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9bc2e316b2d96245a9904da4d484f918db39ed07;p=ikiwiki.git

Escape HTML in Atom feeds, rather than relying on it being well-formed XHTML with no named entity references
---

diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl
index 19c557f30..1ff7f4f4e 100644
--- a/templates/atomitem.tmpl
+++ b/templates/atomitem.tmpl
@@ -10,22 +10,18 @@
 	 <author><name><TMPL_VAR AUTHOR ESCAPE=HTML></name></author>
 	</TMPL_IF>
 	<TMPL_IF NAME="COPYRIGHT">
-	 <rights type="xhtml" xml:lang="en">
-	  <div xmlns="http://www.w3.org/1999/xhtml">
+	 <rights type="html" xml:lang="en">
 	   <TMPL_IF NAME="LICENSE">
-	    <TMPL_VAR LICENSE>
-	    <TMPL_VAR COPYRIGHT>
+	    <TMPL_VAR LICENSE ESCAPE=HTML>
+	    <TMPL_VAR COPYRIGHT ESCAPE=HTML>
 	   <TMPL_ELSE>
-	    <TMPL_VAR COPYRIGHT>
+	    <TMPL_VAR COPYRIGHT ESCAPE=HTML>
 	   </TMPL_IF>
-	  </div>
 	 </rights>
 	<TMPL_ELSE>
 	 <TMPL_IF NAME="LICENSE">
-	  <rights type="xhtml" xml:lang="en">
-	   <div xmlns="http://www.w3.org/1999/xhtml">
-	    <TMPL_VAR LICENSE>
-	   </div>
+	  <rights type="html" xml:lang="en">
+	    <TMPL_VAR LICENSE ESCAPE=HTML>
 	  </rights>
 	 </TMPL_IF>
 	</TMPL_IF>
@@ -39,10 +35,8 @@
 	<TMPL_IF NAME="ENCLOSURE">
 	 <link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" />
 	<TMPL_ELSE>
-	 <content type="xhtml" xml:lang="en">
-	  <div xmlns="http://www.w3.org/1999/xhtml">
-	  <TMPL_VAR CONTENT>
-	  </div>
+	 <content type="html" xml:lang="en">
+	  <TMPL_VAR CONTENT ESCAPE=HTML>
 	 </content>
 	</TMPL_IF>
 </entry>