From: Simon McVittie <http://smcv.pseudorandom.co.uk/>
Date: Sat, 12 Jul 2008 16:12:37 +0000 (+0100)
Subject: Rename [[!inline atomid="..."]] to [[!inline guid="..."]] to be consistent with ... 
X-Git-Tag: 2.54~108
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/415c8e0cb53daec6fff7e2a8f3346efd0958008d

Rename [[!inline atomid="..."]] to [[!inline guid="..."]] to be consistent with [[!meta guid="..."]], which also outputs an Atom <id>
---

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 802fae93a..32915c342 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -308,7 +308,7 @@ sub preprocess_inline (@) { #{{{
 			if (! $params{preview}) {
 				writefile($rssp, $config{destdir},
 					genfeed("rss",
-						$config{url}."/".rsspage($params{destpage}).$feednum, $desc, $params{atomid}, $params{destpage}, @feedlist));
+						$config{url}."/".rsspage($params{destpage}).$feednum, $desc, $params{guid}, $params{destpage}, @feedlist));
 				$toping{$params{destpage}}=1 unless $config{rebuild};
 				$feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />};
 			}
@@ -318,7 +318,7 @@ sub preprocess_inline (@) { #{{{
 			will_render($params{destpage}, $atomp);
 			if (! $params{preview}) {
 				writefile($atomp, $config{destdir},
-					genfeed("atom", $config{url}."/".atompage($params{destpage}).$feednum, $desc, $params{atomid}, $params{destpage}, @feedlist));
+					genfeed("atom", $config{url}."/".atompage($params{destpage}).$feednum, $desc, $params{guid}, $params{destpage}, @feedlist));
 				$toping{$params{destpage}}=1 unless $config{rebuild};
 				$feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="Atom" href="$atomurl" />};
 			}
@@ -415,7 +415,7 @@ sub genfeed ($$$$$@) { #{{{
 	my $feedtype=shift;
 	my $feedurl=shift;
 	my $feeddesc=shift;
-	my $atomid=shift;
+	my $guid=shift;
 	my $page=shift;
 	my @pages=@_;
 	
@@ -485,7 +485,7 @@ sub genfeed ($$$$$@) { #{{{
 		pageurl => $url,
 		content => $content,
 		feeddesc => $feeddesc,
-		atomid => $atomid,
+		guid => $guid,
 		feeddate => date_3339($lasttime),
 		feedurl => $feedurl,
 		version => $IkiWiki::version,
diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl
index 9ec7df435..e834d7693 100644
--- a/templates/atompage.tmpl
+++ b/templates/atompage.tmpl
@@ -31,8 +31,8 @@
   </rights>
  </TMPL_IF>
 </TMPL_IF>
-<TMPL_IF NAME="ATOMID">
-  <id><TMPL_VAR ATOMID></id>
+<TMPL_IF NAME="GUID">
+  <id><TMPL_VAR GUID></id>
 <TMPL_ELSE>
   <id><TMPL_VAR PAGEURL></id>
 </TMPL_IF>