X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/622b866f3ee3d3b5fe76f913559a0afae66af001..d8c4ea783be95b0ec0f4c69a4a1f230ac0e43601:/IkiWiki/Plugin/img.pm

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 14a32f635..c5b86bad8 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -32,9 +32,14 @@ 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};
+	my $dir = $params{destpage};
 	my $base = IkiWiki::basename($file);
 
 	eval q{use Image::Magick};
@@ -51,7 +56,7 @@ sub preprocess (@) { #{{{
 		my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
 		$imglink = "$dir/${w}x${h}-$base";
 		
-		will_render($params{page}, $imglink);
+		will_render($params{destpage}, $imglink);
 
 		if (-e $outfile && (-M srcfile($file) >= -M $outfile)) {
 			$r = $im->Read($outfile);
@@ -106,9 +111,14 @@ 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);
+			$params{link}, linktext => $imgtag,
+			noimageinline => 1);
 	}
 	else {
 		return $imgtag;