releasing version 1.23

[ikiwiki.git] / IkiWiki / Plugin / inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 1cbde71045c51d761a30de8f4cdedb4bbb5f323f..8ceaa95e09f0f491401248716dc365ddd73a41b5 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -46,6 +46,7 @@ sub preprocess_inline (@) { #{{{
        } else {
                $desc = $config{wikiname};
        }
+       my $actions=yesno($params{actions});
 
        my @list;
        foreach my $page (keys %pagesources) {
@@ -94,7 +95,7 @@ sub preprocess_inline (@) { #{{{
                        # is to let the meta plugin get page title info; so stop
                        # calling this next line then once the meta plugin can
                        # store that accross runs (also tags plugin).
-                       my $content=get_inline_content($page, $params{page});
+                       my $content=get_inline_content($page, $params{destpage});
                        # Don't use htmllink because this way the title is separate
                        # and can be overridden by other plugins.
                        my $link=htmlpage(bestlink($params{page}, $page));
@@ -104,6 +105,19 @@ sub preprocess_inline (@) { #{{{
                        $template->param(content => $content);
                        $template->param(ctime => displaytime($pagectime{$page}));
 
+                       if ($actions) {
+                               my $file = $pagesources{$page};
+                               my $type = pagetype($file);
+                               if ($config{discussion}) {
+                                       $template->param(have_actions => 1);
+                                       $template->param(discussionlink => htmllink($page, $page, "Discussion", 1, 1));
+                               }
+                               if (length $config{cgiurl} && defined $type) {
+                                       $template->param(have_actions => 1);
+                                       $template->param(editurl => cgiurl(do => "edit", page => $page));
+                               }
+                       }
+
                        run_hooks(pagetemplate => sub {
                                shift->(page => $page, destpage => $params{page},
                                        template => $template,);
@@ -185,11 +199,11 @@ sub rsspage ($) { #{{{
 } #}}}
 
 sub genrss ($$@) { #{{{
-       my $desc = shift;
+       my $desc=shift;
        my $page=shift;
        my @pages=@_;
        
-       my $url=URI->new(encode_utf8("$config{url}/".htmlpage($page)));
+       my $url=URI->new(encode_utf8($config{url}."/".htmlpage($page)));
        
        my $itemtemplate=template("rssitem.tmpl", blind_cache => 1);
        my $content="";