diff options
| author | Joey Hess <joey@kitenet.net> | 2010-06-12 23:00:30 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-06-12 23:00:30 -0400 |
| commit | c65658eeb5cd83417f3ec1c69eff2ebcd6a481db (patch) | |
| tree | 5b471d24923ef947246fab63bce549ad9b636617 | |
| parent | 35a0715b9a7a84b222523e648e815cbcc21301ed (diff) | |
| download | ikiwiki-c65658eeb5cd83417f3ec1c69eff2ebcd6a481db.tar ikiwiki-c65658eeb5cd83417f3ec1c69eff2ebcd6a481db.tar.gz | |
attachment: When inserting links, insert img directives for images, if that plugin is enabled.
| -rw-r--r-- | IkiWiki/Plugin/attachment.pm | 9 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm index 53a65236c..9c774557f 100644 --- a/IkiWiki/Plugin/attachment.pm +++ b/IkiWiki/Plugin/attachment.pm @@ -195,7 +195,14 @@ sub formbuilder (@) { foreach my $f ($q->param("attachment_select")) { $f=Encode::decode_utf8($f); $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', value => $form->field('editcontent')."\n\n".$add, diff --git a/debian/changelog b/debian/changelog index 07b349c57..fd7d1569e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low page does not exist, so it can be easily created. * edittemplate: Look for template pages under templates/ like everything 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 |