aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-01-14 22:56:42 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-01-14 22:56:42 +0000
commitfa8bbbb0b3724a6a96bc9b910cf8f1e1a7f1b433 (patch)
tree6863b7b465ca2068bca8592510a8a6a3efeea758
parent191c4ee34160f74a35bb4db2bfdec12762924623 (diff)
downloadikiwiki-fa8bbbb0b3724a6a96bc9b910cf8f1e1a7f1b433.tar
ikiwiki-fa8bbbb0b3724a6a96bc9b910cf8f1e1a7f1b433.tar.gz
* Fix bogus use of CDATA in atom feeds. Closes: #406898
-rw-r--r--debian/changelog3
-rw-r--r--templates/atomitem.tmpl2
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index ceeb6d7e7..8ba13ae48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ ikiwiki (1.40) UNRELEASED; urgency=low
* Fix missing categories in rss/atom feeds.
* Add French translation by Jean-Luc Coulon. Closes: #406881
+ * Fix bogus use of CDATA in atom feeds. Closes: #406898
- -- Joey Hess <joeyh@debian.org> Sun, 14 Jan 2007 15:44:42 -0500
+ -- Joey Hess <joeyh@debian.org> Sun, 14 Jan 2007 17:49:11 -0500
ikiwiki (1.39) unstable; urgency=low
diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl
index 005519296..9dfcb1b32 100644
--- a/templates/atomitem.tmpl
+++ b/templates/atomitem.tmpl
@@ -17,7 +17,7 @@
<TMPL_ELSE>
<content type="xhtml" xml:lang="en">
<div xmlns="http://www.w3.org/1999/xhtml">
- ![CDATA[<TMPL_VAR CONTENT>]]
+ <TMPL_VAR CONTENT>
</div>
</content>
</TMPL_IF>