Set isPermaLink="no" for guids in rss feeds.

The rss spec says that unless the attribute is set, guid elements *are*
permalinks. The problem with that is that if [[meta permalink=]] is used,
as is done with aggregated posts, that goes into the link element, and
apparently some rss readers prefer the not-really-permalink in the guid
element when linking to the post.

Without meta permalink, the link and guid elements have the same content,
so it should be ok, in that case too for the guid to not be a permalink.

(Checked and this does not flood aggregators.)
(cherry picked from commit 894d09ba9482dd53448986f487ca0f372083fee4)

Conflicts:

	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 5b8e53a560d6a53b5112fb3215aaeaa58cb6b92a..c599bd915a44a86402caf0175fe0e7dc40aa6ce3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-ikiwiki (3.20100927) UNRELEASED; urgency=low
-
-  * Fix test suite failure on other side of date line.
-
- -- Joey Hess <joeyh@debian.org>  Wed, 29 Sep 2010 11:58:23 -0400
-
 ikiwiki (3.20100815.2) UNRELEASED; urgency=low
 
   * openid: Syntax tweak to the javascript code to make it work with MSIE 7
@@ -15,6 +9,8 @@ ikiwiki (3.20100815.2) UNRELEASED; urgency=low
     of the rst plugin.
   * websetup: Fix saving of advanced mode changes.
   * websetup: Fix defaults of checkboxes in advanced mode.
+  * Fix test suite failure on other side of date line.
+  * Set isPermaLink="no" for guids in rss feeds. 
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Aug 2010 11:42:55 -0400
 

diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl
index a64a4ebd79273ceac6c62081efee655e40b9c449..272b340bbdf144373ecd3a484e92bbbeb369cd55 100644 (file)
--- a/templates/rssitem.tmpl
+++ b/templates/rssitem.tmpl
@@ -8,7 +8,7 @@
 <TMPL_IF GUID>
        <guid isPermaLink="no"><TMPL_VAR GUID></guid>
 <TMPL_ELSE>
-       <guid><TMPL_VAR URL></guid>
+       <guid isPermaLink="no"><TMPL_VAR URL></guid>
 </TMPL_IF>
        <link><TMPL_VAR PERMALINK></link>
 <TMPL_IF CATEGORIES>