projects
/
ikiwiki.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
71fba77
)
convert fatal error to warning
author
Joey Hess
<joey@kodama.kitenet.net>
Sun, 13 Jul 2008 00:21:42 +0000
(20:21 -0400)
committer
Joey Hess
<joey@kodama.kitenet.net>
Sun, 13 Jul 2008 00:21:42 +0000
(20:21 -0400)
Since perlmagick is not a hard dep, and goodstuff is enabled by default,
imgs should not crash builds
IkiWiki/Plugin/img.pm
patch
|
blob
|
history
diff --git
a/IkiWiki/Plugin/img.pm
b/IkiWiki/Plugin/img.pm
index cc0e84b01f09a7527c341a99c8262eeebb34d106..49e1d57d61b49a3eb0faa7740a2a3a5c74fd744b 100644
(file)
--- a/
IkiWiki/Plugin/img.pm
+++ b/
IkiWiki/Plugin/img.pm
@@
-46,7
+46,7
@@
sub preprocess (@) { #{{{
my $base = IkiWiki::basename($file);
eval q{use Image::Magick};
-
error($@)
if $@;
+
return "[[img ".gettext("Image::Magick not installed")."]]"
if $@;
my $im = Image::Magick->new;
my $imglink;
my $r;