Merge commit 'smcv/aggregateinternal' into aggregateinternal

[ikiwiki.git] / templates / atompage.tmpl

diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl
index b7ba74f47ba8506473b5f9dd37c8766b7bc93e10..e834d7693829d4253225324328b062a52f7bc680 100644 (file)
--- a/templates/atompage.tmpl
+++ b/templates/atompage.tmpl
@@ -31,7 +31,11 @@
   </rights>
  </TMPL_IF>
 </TMPL_IF>
-<id><TMPL_VAR PAGEURL></id>
+<TMPL_IF NAME="GUID">
+  <id><TMPL_VAR GUID></id>
+<TMPL_ELSE>
+  <id><TMPL_VAR PAGEURL></id>
+</TMPL_IF>
 <subtitle type="html"><TMPL_VAR FEEDDESC ESCAPE=HTML></subtitle>
 <generator uri="http://ikiwiki.info/" version="<TMPL_VAR VERSION>">ikiwiki</generator>
 <updated><TMPL_VAR FEEDDATE></updated>