commas

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 6518be794f08f905a6bc154bc4e8080ac36143ac..70d5be2353665b574752d3b23109150e0ece9340 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -95,11 +95,11 @@ 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).
                        # 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));
                        # 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));

-                       $link=abs2rel($link, dirname($params{page}));
+                       $link=abs2rel($link, dirname($params{destpage}));

                        $template->param(pageurl => $link);
                        $template->param(title => pagetitle(basename($page)));
                        $template->param(content => $content);
                        $template->param(pageurl => $link);
                        $template->param(title => pagetitle(basename($page)));
                        $template->param(content => $content);


@@ -108,11 +108,12 @@ sub preprocess_inline (@) { #{{{
                        if ($actions) {
                                my $file = $pagesources{$page};
                                my $type = pagetype($file);
                        if ($actions) {
                                my $file = $pagesources{$page};
                                my $type = pagetype($file);

-                               $template->param(have_actions => 1);

                                if ($config{discussion}) {
                                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(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));
                                }
                        }
                                        $template->param(editurl => cgiurl(do => "edit", page => $page));
                                }
                        }


@@ -198,11 +199,11 @@ sub rsspage ($) { #{{{
 } #}}}
 
 sub genrss ($$@) { #{{{
 } #}}}
 
 sub genrss ($$@) { #{{{

-       my $desc = shift;
+       my $desc=shift;

        my $page=shift;
        my @pages=@_;
        
        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="";
        
        my $itemtemplate=template("rssitem.tmpl", blind_cache => 1);
        my $content="";