web commit by http://ptecza.myopenid.com/: * Question about nested plugins

[git.ikiwiki.info.git] / IkiWiki / Plugin / img.pm

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 0503f4097c336b1194e023231d87738238a0b6e2..cff9dabf082f3429e1bc6937aba9ed86ec9d00d4 100644 (file)
--- 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