Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
do not display two glasses
[git.ikiwiki.info.git]
/
IkiWiki
/
Plugin
/
attachment.pm
diff --git
a/IkiWiki/Plugin/attachment.pm
b/IkiWiki/Plugin/attachment.pm
index 5a180cd5cf3c3eaac5282ef267982327e49eba8d..aea70429d0bcc3bc86a776ba8b2dde8352483a37 100644
(file)
--- a/
IkiWiki/Plugin/attachment.pm
+++ b/
IkiWiki/Plugin/attachment.pm
@@
-148,7
+148,7
@@
sub formbuilder (@) {
$f=Encode::decode_utf8($f);
$f=~s/^$page\///;
if (IkiWiki::isinlinableimage($f) &&
$f=Encode::decode_utf8($f);
$f=~s/^$page\///;
if (IkiWiki::isinlinableimage($f) &&
-
UNIVERSAL::can("IkiWiki::Plugin::img",
"import")) {
+
IkiWiki::Plugin::img->can(
"import")) {
$add.='[[!img '.$f.' align="right" size="" alt=""]]';
}
else {
$add.='[[!img '.$f.' align="right" size="" alt=""]]';
}
else {
@@
-286,7
+286,7
@@
sub attachments_save {
}
return unless @attachments;
require IkiWiki::Render;
}
return unless @attachments;
require IkiWiki::Render;
- IkiWiki::prune($dir);
+ IkiWiki::prune($dir
, $config{wikistatedir}."/attachments"
);
# Check the attachments in and trigger a wiki refresh.
if ($config{rcs}) {
# Check the attachments in and trigger a wiki refresh.
if ($config{rcs}) {