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

attachment: When inserting links, insert img directives for images, if that plugin is enabled.

master
Joey Hess 2010-06-12 23:00:30 -04:00
parent 35a0715b9a
commit c65658eeb5
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
IkiWiki/Plugin/attachment.pm
View File

@ -195,7 +195,14 @@ sub formbuilder (@) {
foreach my $f ($q->param("attachment_select")) { foreach my $f ($q->param("attachment_select")) {
$f=Encode::decode_utf8($f); $f=Encode::decode_utf8($f);
$f=~s/^$page\///; $f=~s/^$page\///;
$add.="[[$f]]\n"; if (IkiWiki::isinlinableimage($f) &&
UNIVERSAL::can("IkiWiki::Plugin::img", "import")) {
$add.='[[!img '.$f.' align="right" size="" alt=""]]';
}
else {
$add.="[[$f]]";
}
$add.="\n";
} }
$form->field(name => 'editcontent', $form->field(name => 'editcontent',
value => $form->field('editcontent')."\n\n".$add, value => $form->field('editcontent')."\n\n".$add,

2
debian/changelog vendored
View File

@ -10,6 +10,8 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
page does not exist, so it can be easily created. page does not exist, so it can be easily created.
* edittemplate: Look for template pages under templates/ like everything * edittemplate: Look for template pages under templates/ like everything
else (still looks in old location for backwards compatability). else (still looks in old location for backwards compatability).
* attachment: When inserting links, insert img directives for images,
if that plugin is enabled.
-- Joey Hess <joeyh@debian.org> Fri, 11 Jun 2010 13:39:15 -0400 -- Joey Hess <joeyh@debian.org> Fri, 11 Jun 2010 13:39:15 -0400