Merge commit 'upstream/master' into pub/master

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

diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl
index 1b1d686dddebb0d830e1c32e2c203cf5c03469ff..1ff7f4f4eff5a2a4e4e1ce3d989faaad8401d1b6 100644 (file)
--- a/templates/atomitem.tmpl
+++ b/templates/atomitem.tmpl
@@ -1,27 +1,27 @@
 <entry>
        <title><TMPL_VAR TITLE></title>
-       <id><TMPL_VAR URL></id>
+       <TMPL_IF NAME="GUID">
+         <id><TMPL_VAR GUID></id>
+       <TMPL_ELSE>
+         <id><TMPL_VAR URL></id>
+       </TMPL_IF>
        <link href="<TMPL_VAR PERMALINK>"/>
        <TMPL_IF NAME="AUTHOR">
         <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>
@@ -35,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>