X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3bd439fa03c13f19e7305b82fff23779e303154d..376944cb026945ab597db01eb1e3aea4fa320007:/IkiWiki/Plugin/img.pm

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index c4e4a6f22..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,6 +111,15 @@ sub preprocess (@) { #{{{
 	if (! defined $params{link} || lc($params{link}) eq 'yes') {
 		return  '<a href="'.$fileurl.'">'.$imgtag.'</a>';
 	}
+	elsif ($params{link} =~ /^\w+:\/\//) {
+		return  '<a href="'.$params{link}.'">'.$imgtag.'</a>';
+	}
+	elsif (length bestlink($params{page}, $params{link})) {
+		add_depends($params{page}, $params{link});
+		return htmllink($params{page}, $params{destpage},
+			$params{link}, linktext => $imgtag,
+			noimageinline => 1);
+	}
 	else {
 		return $imgtag;
 	}