Merge branch 'master' into autoconfig

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 8fa330e6d2d07c54b0766b6ba5062b24bef28b68..3fe33c858ae849f7314a2e33ab9a40d946f259f6 100644 (file)
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -206,8 +206,10 @@ sub formbuilder (@) { #{{{
                IkiWiki::saveindex();
        }
        elsif ($form->submitted eq "Insert Links") {
+               my $page=quotemeta($q->param("page"));
                my $add="";
                foreach my $f ($q->param("attachment_select")) {
+                       $f=~s/^$page\///;
                        $add.="[[$f]]\n";
                }
                $form->field(name => 'editcontent',

diff --git a/debian/changelog b/debian/changelog
index 7df5881746966464d46b6672339c68f939509932..348d30997ef2843307211669d4ed18989021e888 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ ikiwiki (2.55) UNRELEASED; urgency=low
   * monotone: Add support for rename, delete, and also diff. (William Uther)
   * toggle: Fix incompatability between javascript and webkit.
   * bzr: Add support for rename and delete. (Jelmer Vernooij)
+  * attachment: Use relative paths when inserting links.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2008 11:35:46 -0400