Rename [[!inline atomid="..."]] to [[!inline guid="..."]] to be consistent with ...
authorSimon McVittie <http://smcv.pseudorandom.co.uk/>
Sat, 12 Jul 2008 16:12:37 +0000 (17:12 +0100)
committerSimon McVittie <http://smcv.pseudorandom.co.uk/>
Sat, 12 Jul 2008 16:12:37 +0000 (17:12 +0100)
IkiWiki/Plugin/inline.pm
templates/atompage.tmpl

index 802fae93a4a68a73850c8c79721f401698a5261a..32915c342d33898a68e8cf8b3a2a48845eeb0311 100644 (file)
@@ -308,7 +308,7 @@ sub preprocess_inline (@) { #{{{
                        if (! $params{preview}) {
                                writefile($rssp, $config{destdir},
                                        genfeed("rss",
                        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" />};
                        }
                                $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},
                        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" />};
                        }
                                $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 $feedtype=shift;
        my $feedurl=shift;
        my $feeddesc=shift;
-       my $atomid=shift;
+       my $guid=shift;
        my $page=shift;
        my @pages=@_;
        
        my $page=shift;
        my @pages=@_;
        
@@ -485,7 +485,7 @@ sub genfeed ($$$$$@) { #{{{
                pageurl => $url,
                content => $content,
                feeddesc => $feeddesc,
                pageurl => $url,
                content => $content,
                feeddesc => $feeddesc,
-               atomid => $atomid,
+               guid => $guid,
                feeddate => date_3339($lasttime),
                feedurl => $feedurl,
                version => $IkiWiki::version,
                feeddate => date_3339($lasttime),
                feedurl => $feedurl,
                version => $IkiWiki::version,
index 9ec7df435b3be286a82f30c771c9ec3a1ef0bc4a..e834d7693829d4253225324328b062a52f7bc680 100644 (file)
@@ -31,8 +31,8 @@
   </rights>
  </TMPL_IF>
 </TMPL_IF>
   </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>
 <TMPL_ELSE>
   <id><TMPL_VAR PAGEURL></id>
 </TMPL_IF>