Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 4507ace4d672ce34f055d2ccbc582fbb579247c4..27ea1c4a64bf8ebca3be99755c86a08a2192cb65 100644 (file)
--- 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 ae7ce90bef4bbbce89b508aec68ce64799c4636c..9244ccdb89a03d14122938a22fdebf5f22b6f888 100644 (file)
--- 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 ffb4a7c16f591104d62615c6f89651467d9f4138..6d732fd6b1d59818687a930342b9b02a123e99f5 100644 (file)
--- 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}],
 }