diff options
| author | Simon McVittie <http://smcv.pseudorandom.co.uk/> | 2008-07-12 17:12:37 +0100 |
|---|---|---|
| committer | Simon McVittie <http://smcv.pseudorandom.co.uk/> | 2008-07-12 17:12:37 +0100 |
| commit | 415c8e0cb53daec6fff7e2a8f3346efd0958008d (patch) | |
| tree | 6e42b7b7985aa6fab63ad66baa21a3caeb5cac91 | |
| parent | 2bd8ada5a619a1c32bf19f44e4f96e083ceb17b8 (diff) | |
| download | ikiwiki-415c8e0cb53daec6fff7e2a8f3346efd0958008d.tar ikiwiki-415c8e0cb53daec6fff7e2a8f3346efd0958008d.tar.gz | |
Rename [[!inline atomid="..."]] to [[!inline guid="..."]] to be consistent with [[!meta guid="..."]], which also outputs an Atom <id>
| -rw-r--r-- | IkiWiki/Plugin/inline.pm | 8 | ||||
| -rw-r--r-- | templates/atompage.tmpl | 4 |
2 files changed, 6 insertions, 6 deletions
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> |