summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--templates/atomitem.tmpl22
-rw-r--r--templates/atompage.tmpl14
-rw-r--r--templates/rssitem.tmpl2
3 files changed, 14 insertions, 24 deletions
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>
diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl
index e834d7693..dcb89ab5c 100644
--- a/templates/atompage.tmpl
+++ b/templates/atompage.tmpl
@@ -12,22 +12,18 @@
</TMPL_IF>
</author>
<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 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">
+ <TMPL_VAR LICENSE ESCAPE=HTML>
</rights>
</TMPL_IF>
</TMPL_IF>
diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl
index 1144cd5e2..42936a668 100644
--- a/templates/rssitem.tmpl
+++ b/templates/rssitem.tmpl
@@ -21,6 +21,6 @@
<TMPL_IF NAME="ENCLOSURE">
<enclosure url="<TMPL_VAR ENCLOSURE>" type="<TMPL_VAR TYPE>" length="<TMPL_VAR LENGTH>" />
<TMPL_ELSE>
- <description><![CDATA[<TMPL_VAR CONTENT>]]></description>
+ <description><TMPL_VAR CONTENT ESCAPE=HTML></description>
</TMPL_IF>
</item>