X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/f194e477c4a3fe43cdf28e43476fce34b0ae1ccf..3bd439fa03c13f19e7305b82fff23779e303154d:/IkiWiki/Plugin/img.pm

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index a453a49ba..c4e4a6f22 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -96,12 +96,19 @@ 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>';
+	}
+	else {
+		return $imgtag;
+	}
 } #}}}
 
 1