urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into autoconfig

master
Joey Hess 2008-07-25 19:27:15 -04:00
parent 1f8b0460c3 b7bf566f55
commit d0bd30824e
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki/Plugin/attachment.pm
View File

@ -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',

1
debian/changelog vendored
View File

@ -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