X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/622b866f3ee3d3b5fe76f913559a0afae66af001..d02e350a69635c3d8e7c30cf51dc446936c6cbf1:/IkiWiki/Plugin/img.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index 14a32f635..b6e7c9e41 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -32,6 +32,11 @@ sub preprocess (@) { #{{{ } push @{$links{$params{page}}}, $image; + # optimisation: detect scan mode, and avoid generating the image + if (! defined wantarray) { + return; + } + my $file = bestlink($params{page}, $image); my $dir = $params{page}; @@ -106,9 +111,14 @@ sub preprocess (@) { #{{{ if (! defined $params{link} || lc($params{link}) eq 'yes') { return ''.$imgtag.''; } + elsif ($params{link} =~ /^\w+:\/\//) { + return ''.$imgtag.''; + } elsif (length bestlink($params{page}, $params{link})) { + add_depends($params{page}, $params{link}); return htmllink($params{page}, $params{destpage}, - $params{link}, linktext => $imgtag); + $params{link}, linktext => $imgtag, + noimageinline => 1); } else { return $imgtag;