Accept [[!inline ... atomid="..."]] and use it to populate the feed's Atom <id>.

[git.ikiwiki.info.git] / IkiWiki / Plugin / recentchanges.pm

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 3020b6a6a3d1ecd59a12fe3e89cdcc620d5456bc..8383fb72a12e19c8d92627956efc154855ff57e5 100644 (file)
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -40,14 +40,8 @@ sub pagetemplate (@) { #{{{
        my $template=$params{template};
        my $page=$params{page};
 
-       # XXX this is here because I've been seeing a strange uninitialized
-       # value in this sub.
-       if (! defined $config{recentchangespage}) {
-               eval q{use Carp};
-               Carp::cluck("undefined recentchangespage; please report this to Joey");
-       }
-
-       if ($config{rcs} && $page ne $config{recentchangespage} &&
+       if (defined $config{recentchangespage} && $config{rcs} &&
+           $page ne $config{recentchangespage} &&
            $template->query(name => "recentchangesurl")) {
                $template->param(recentchangesurl => urlto($config{recentchangespage}, $page));
                $template->param(have_actions => 1);
@@ -86,7 +80,7 @@ sub cgi ($) { #{{{
                                "</p>");
                }
                else {
-                       IkiWiki::redirect($cgi, $config{url}."/".htmlpage($link));
+                       IkiWiki::redirect($cgi, $config{url}.IkiWiki::beautify_urlpath("/".htmlpage($link)));
                }
 
                exit;