pagecount: Fix broken optimisation for * pagespec.

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

diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl
index 19c557f305401e800037ad97d96a561d32fa4261..768695a2ca0d434e376cdf1b1de7325376b5aa49 100644 (file)
--- 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">
         <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_IF NAME="LICENSE">

-           <TMPL_VAR LICENSE>
-           <TMPL_VAR COPYRIGHT>
+           <TMPL_VAR LICENSE ESCAPE=HTML>
+           <TMPL_VAR COPYRIGHT ESCAPE=HTML>

           <TMPL_ELSE>
           <TMPL_ELSE>

-           <TMPL_VAR COPYRIGHT>
+           <TMPL_VAR COPYRIGHT ESCAPE=HTML>

           </TMPL_IF>
           </TMPL_IF>

-         </div>

         </rights>
        <TMPL_ELSE>
         <TMPL_IF NAME="LICENSE">
         </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>
          </rights>
         </TMPL_IF>
        </TMPL_IF>


@@ -39,10 +35,14 @@
        <TMPL_IF NAME="ENCLOSURE">
         <link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" />
        <TMPL_ELSE>
        <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>
         </content>
        </TMPL_IF>

+       <TMPL_IF NAME="COMMENTSURL">
+       <link rel="comments" href="<TMPL_VAR NAME="COMMENTSURL">" type="text/html" />
+       </TMPL_IF>
+       <TMPL_IF NAME="ATOMCOMMENTSURL">
+       <link rel="comments" href="<TMPL_VAR NAME="ATOMCOMMENTSURL">" type="application/atom+xml" />
+       </TMPL_IF>

 </entry>
 </entry>