aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-05-05 20:06:50 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-05-05 20:06:50 -0400
commite77d0030d61b8b8ad44f296a003c8713766ffd51 (patch)
tree0b397fa4da20a5299f61b6aad6726a52cb250b60
parentad2f1805a9994440b68c6972b92a88a520ad98fc (diff)
downloadikiwiki-e77d0030d61b8b8ad44f296a003c8713766ffd51.tar
ikiwiki-e77d0030d61b8b8ad44f296a003c8713766ffd51.tar.gz
inline: Minor optimisation.
When finding the pageurl, it was calling bestlink unnecessarily. Since at this point $page contains the full name of the page that is being inlined, there is no need to do bestlink's scan for it. This is only a minor optimisation, since bestlink is only called once per displayed, inlined page.
-rw-r--r--IkiWiki/Plugin/inline.pm2
-rw-r--r--debian/changelog1
2 files changed, 2 insertions, 1 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