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
(no commit message)
[git.ikiwiki.info.git]
/
IkiWiki
/
Plugin
/
img.pm
diff --git
a/IkiWiki/Plugin/img.pm
b/IkiWiki/Plugin/img.pm
index 42de81bd16defdfbb4535cfd3c373e3bd1e52383..66cc08530e685e8d10f6ae90646d7496a00401d2 100644
(file)
--- a/
IkiWiki/Plugin/img.pm
+++ b/
IkiWiki/Plugin/img.pm
@@
-10,9
+10,18
@@
use IkiWiki 2.00;
my %imgdefaults;
sub import { #{{{
my %imgdefaults;
sub import { #{{{
+ hook(type => "getsetup", id => "img", call => \&getsetup);
hook(type => "preprocess", id => "img", call => \&preprocess, scan => 1);
} #}}}
hook(type => "preprocess", id => "img", call => \&preprocess, scan => 1);
} #}}}
+sub getsetup () { #{{{
+ return
+ plugin => {
+ safe => 1,
+ rebuild => undef,
+ },
+} #}}}
+
sub preprocess (@) { #{{{
my ($image) = $_[0] =~ /$config{wiki_file_regexp}/; # untaint
my %params=@_;
sub preprocess (@) { #{{{
my ($image) = $_[0] =~ /$config{wiki_file_regexp}/; # untaint
my %params=@_;
@@
-42,8
+51,8
@@
sub preprocess (@) { #{{{
my $file = bestlink($params{page}, $image);
my $srcfile = srcfile($file, 1);
my $file = bestlink($params{page}, $image);
my $srcfile = srcfile($file, 1);
- if (! defined $srcfile) {
-
error(sprintf(gettext("%s not found"), $image)
);
+ if (!
length $file || !
defined $srcfile) {
+
return htmllink($params{page}, $params{destpage}, $image
);
}
my $dir = $params{page};
}
my $dir = $params{page};