Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/debian/changelog b/debian/changelog
index 3428aa6d395b3b11780e800449ee1eab24754927..8b127b574c5b1087666b4c601bac08a9cb5b2216 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low
     information earlier than the delete hook.
   * actiontabs: Improve tab padding.
   * blueview: Fix display of links to translated pages in the page header.
+  * Set isPermaLink="no" for guids in rss feeds. 
 
  -- Joey Hess <joeyh@debian.org>  Tue, 07 Sep 2010 12:08:05 -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>