* Patch to fix validaton of atom feeds by fixing the category tags.

diff --git a/debian/changelog b/debian/changelog
index af5c9c06c1297841b8a5240b8968c7ad36b248fe..fb2d2d1475b9fbbc5c99b84afdecd499175e0cde 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (1.44) UNRELEASED; urgency=low
+
+  * Patch to fix validaton of atom feeds by fixing the category tags.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 18 Feb 2007 23:40:32 -0500
+

 ikiwiki (1.43) unstable; urgency=low
 
   * Allow plugins to add new types of tests that can be used in PageSpecs.
 ikiwiki (1.43) unstable; urgency=low
 
   * Allow plugins to add new types of tests that can be used in PageSpecs.

diff --git a/doc/patchqueue/atom-category-fix.mdwn b/doc/patchqueue/atom-category-fix.mdwn
deleted file mode 100644 (file)
index 199f769..0000000
--- a/doc/patchqueue/atom-category-fix.mdwn
+++ /dev/null
@@ -1,15 +0,0 @@
-The Atom feed fails validation at http://feedvalidator.org/ because the `<category>` tags are syntactically incorrect ([spec](http://www.atomenabled.org/developers/syndication/atom-format-spec.php#element.category)). With this patch it validates.
-
-    Index: templates/atomitem.tmpl
-    ===================================================================
-    --- templates/atomitem.tmpl     (revision 2640)
-    +++ templates/atomitem.tmpl     (working copy)
-    @@ -8,7 +8,7 @@
-            <link href="<TMPL_VAR PERMALINK>"/>
-            <TMPL_IF NAME="CATEGORIES">
-            <TMPL_LOOP NAME="CATEGORIES">
-    -       <category><TMPL_VAR CATEGORY></category>
-    +       <category term="<TMPL_VAR CATEGORY>" />
-            </TMPL_LOOP>
-            </TMPL_IF>
-            <updated><TMPL_VAR DATE_3339></updated>
\ No newline at end of file

diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl
index 9dfcb1b3283bdbccfe1a5f3b4fe577efc6f4fab4..bdbfe69c7d9034db3570ee1ce73d196e6e18e910 100644 (file)
--- a/templates/atomitem.tmpl
+++ b/templates/atomitem.tmpl
@@ -8,7 +8,7 @@
        <link href="<TMPL_VAR PERMALINK>"/>
        <TMPL_IF NAME="CATEGORIES">
        <TMPL_LOOP NAME="CATEGORIES">
        <link href="<TMPL_VAR PERMALINK>"/>
        <TMPL_IF NAME="CATEGORIES">
        <TMPL_LOOP NAME="CATEGORIES">

-       <category><TMPL_VAR CATEGORY></category>
+       <category term="<TMPL_VAR CATEGORY>" />

        </TMPL_LOOP>
        </TMPL_IF>
        <updated><TMPL_VAR DATE_3339></updated>
        </TMPL_LOOP>
        </TMPL_IF>
        <updated><TMPL_VAR DATE_3339></updated>