diff options
author | Jonas Smedegaard <dr@jones.dk> | 2008-08-01 21:13:35 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-01 21:13:35 +0200 |
commit | be3fe912791f7332374ca231422d3a06b05778e9 (patch) | |
tree | 5295c217ac8424a895370d956037a650d6445435 /atompage.tmpl | |
parent | 2fb8dbca8338e24e7018355295d8248eba6e1132 (diff) |
Sync with ikiwiki 2.55.
Diffstat (limited to 'atompage.tmpl')
-rw-r--r-- | atompage.tmpl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/atompage.tmpl b/atompage.tmpl index acc4737..e834d76 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> |