summaryrefslogtreecommitdiff
path: root/atompage.tmpl
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-01 21:56:29 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-01 21:56:29 +0200
commit4fb9600af4d836e61a341531507380465b715226 (patch)
tree5923e697613268321fe8da3ad8536cc7b4ef5398 /atompage.tmpl
parent16dcd6d3af047971985cabce68d9e06b4a399fad (diff)
parentbe3fe912791f7332374ca231422d3a06b05778e9 (diff)
Merge branch 'master' into master-da
Conflicts (merged manually): editpage.tmpl searchquery.tmpl Pages translated as part of the merge: editconflict.tmpl editcreationconflict.tmpl editfailedsave.tmpl editpagegone.tmpl renamesummary.tmpl
Diffstat (limited to 'atompage.tmpl')
-rw-r--r--atompage.tmpl8
1 files changed, 6 insertions, 2 deletions
diff --git a/atompage.tmpl b/atompage.tmpl
index de08e68..457d729 100644
--- a/atompage.tmpl
+++ b/atompage.tmpl
@@ -3,7 +3,7 @@
<feed xmlns="http://www.w3.org/2005/Atom">
<title><TMPL_VAR TITLE></title>
<link href="<TMPL_VAR PAGEURL>"/>
-<link href="<TMPL_VAR FEEDURL>" rel="self"/>
+<link href="<TMPL_VAR FEEDURL>" rel="self" type="application/atom+xml"/>
<author>
<TMPL_IF NAME="AUTHOR">
<name><TMPL_VAR AUTHOR></name>
@@ -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>