Merge branch 'master'

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

diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl
index 9ec7df435b3be286a82f30c771c9ec3a1ef0bc4a..dcb89ab5cfac9ed6f26ca1e15a20caf58e6f9491 100644 (file)
--- a/templates/atompage.tmpl
+++ b/templates/atompage.tmpl
@@ -12,27 +12,23 @@
 </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>
-<TMPL_IF NAME="ATOMID">
-  <id><TMPL_VAR ATOMID></id>
+<TMPL_IF NAME="GUID">
+  <id><TMPL_VAR GUID></id>
 <TMPL_ELSE>
   <id><TMPL_VAR PAGEURL></id>
 </TMPL_IF>