From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 25 Jul 2008 23:22:29 +0000 (-0400)
Subject: attachment: Use relative paths when inserting links.
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/b7bf566f55ec844a1d472b2efb8a2863638aacdc

attachment: Use relative paths when inserting links.
---

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 9dbc66020..720078be1 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -193,8 +193,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 7df588174..348d30997 100644
--- 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