diff options
| -rw-r--r-- | IkiWiki/Plugin/inline.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | docwiki.setup | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 4507ace4d..27ea1c4a6 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -342,7 +342,7 @@ sub preprocess_inline (@) { 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})); diff --git a/debian/changelog b/debian/changelog index ae7ce90be..9244ccdb8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ ikiwiki (3.12) UNRELEASED; urgency=low * ikiwiki-makerepo: Avoid using abs_path, as it apparently fails on nonexistant directories with some broken perl versions. + * inline: Minor optimisation. -- Joey Hess <joeyh@debian.org> Mon, 04 May 2009 19:17:39 -0400 diff --git a/docwiki.setup b/docwiki.setup index ffb4a7c16..6d732fd6b 100644 --- a/docwiki.setup +++ b/docwiki.setup @@ -15,7 +15,5 @@ use IkiWiki::Setup::Standard { userdir => "users", usedirs => 0, prefix_directives => 1, - cgiurl => "http://me", - url => "http://me", add_plugins => [qw{goodstuff version haiku polygen fortune}], } |