call initLanguage after initTheme

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 366357095ee24cee2ac61691538b92196f870e9d..27ea1c4a64bf8ebca3be99755c86a08a2192cb65 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -184,7 +184,7 @@ sub preprocess_inline (@) {
        }
 
        my @list=pagespec_match_list(
        }
 
        my @list=pagespec_match_list(

-               [ grep { $_ ne $params{page}} keys %pagesources ],
+               [ grep { $_ ne $params{page} } keys %pagesources ],

                $params{pages}, location => $params{page});
 
        if (exists $params{sort} && $params{sort} eq 'title') {
                $params{pages}, location => $params{page});
 
        if (exists $params{sort} && $params{sort} eq 'title') {


@@ -342,7 +342,7 @@ sub preprocess_inline (@) {
                                        my $content=get_inline_content($page, $params{destpage});
                                        $template->param(content => $content);
                                }
                                        my $content=get_inline_content($page, $params{destpage});
                                        $template->param(content => $content);
                                }

-                               $template->param(pageurl => urlto(bestlink($params{page}, $page), $params{destpage}));
+                               $template->param(pageurl => urlto($page, $params{destpage}));

                                $template->param(inlinepage => $page);
                                $template->param(title => pagetitle(basename($page)));
                                $template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}));
                                $template->param(inlinepage => $page);
                                $template->param(title => pagetitle(basename($page)));
                                $template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}));