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

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 0503f4097..cff9dabf0 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -34,7 +34,7 @@ sub preprocess (@) { #{{{
 	push @{$links{$params{page}}}, $image;
 	my $file = bestlink($params{page}, $image);
 
-	my $dir = IkiWiki::dirname($file);
+	my $dir = $params{page};
 	my $base = IkiWiki::basename($file);
 
 	eval q{use Image::Magick};
@@ -50,7 +50,7 @@ sub preprocess (@) { #{{{
 
 		my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
 		$imglink = "$dir/${w}x${h}-$base";
-				
+		
 		will_render($params{page}, $imglink);
 
 		if (-e $outfile && (-M srcfile($file) >= -M $outfile)) {
@@ -98,7 +98,10 @@ sub preprocess (@) { #{{{
 
 	return '<a href="'.$fileurl.'"><img src="'.$imgurl.
 		'" alt="'.$alt.'" width="'.$im->Get("width").
-		'" height="'.$im->Get("height").'" /></a>';
+		'" height="'.$im->Get("height").'"'.
+		(exists $params{class} ? ' class="'.$params{class}.'"' : '').
+		(exists $params{id} ? ' id="'.$params{id}.'"' : '').
+		' /></a>';
 } #}}}
 
 1