diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-25 19:27:15 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-25 19:27:15 -0400 |
| commit | d0bd30824ec9c1f2af04d9e3d9b13473c8fcb9d8 (patch) | |
| tree | c8e5e1e22adcea36326e85c2dcfd80f7e8583673 | |
| parent | 1f8b0460c309c54cfbfe4152bbc195a1756cbda5 (diff) | |
| parent | b7bf566f55ec844a1d472b2efb8a2863638aacdc (diff) | |
Merge branch 'master' into autoconfig
| -rw-r--r-- | IkiWiki/Plugin/attachment.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm index 8fa330e6d..3fe33c858 100644 --- 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 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 |