From: Joey Hess Date: Fri, 12 Nov 2010 06:03:47 +0000 (-0400) Subject: Set isPermaLink="no" for guids in rss feeds. X-Git-Tag: 3.20100815.2~8 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/e7a5327569f9c0b79625ee97fe78b795adb2d7e4 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 5b8e53a56..c599bd915 100644 --- 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 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 Sun, 15 Aug 2010 11:42:55 -0400 diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl index a64a4ebd7..272b340bb 100644 --- a/templates/rssitem.tmpl +++ b/templates/rssitem.tmpl @@ -8,7 +8,7 @@ - +