X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/9a122f001aa44af70b8a6c0861c1ab869d4379f7..b72b8b2b0ec5888d53450db26e20252d1e18fb99:/IkiWiki/Plugin/img.pm

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index a453a49ba..14a32f635 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -96,12 +96,23 @@ sub preprocess (@) { #{{{
 		return "[[img ".sprintf(gettext("failed to determine size of image %s"), $file)."]]";
 	}
 
-	return '<a href="'.$fileurl.'"><img src="'.$imgurl.
+	my $imgtag='<img src="'.$imgurl.
 		'" alt="'.$alt.'" width="'.$im->Get("width").
 		'" height="'.$im->Get("height").'"'.
 		(exists $params{class} ? ' class="'.$params{class}.'"' : '').
 		(exists $params{id} ? ' id="'.$params{id}.'"' : '').
-		' /></a>';
+		' />';
+
+	if (! defined $params{link} || lc($params{link}) eq 'yes') {
+		return  '<a href="'.$fileurl.'">'.$imgtag.'</a>';
+	}
+	elsif (length bestlink($params{page}, $params{link})) {
+		return htmllink($params{page}, $params{destpage},
+			$params{link}, linktext => $imgtag);
+	}
+	else {
+		return $imgtag;
+	}
 } #}}}
 
 1