ENV can be used in the setup file to override environment variable setting, such...

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

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index c5b86bad8311c42ca8c88993c9e55f62845ab988..abc7e099ace54d78ef33f919ca1ebf6eaa2ad6ba 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -22,11 +22,13 @@ sub preprocess (@) { #{{{
        }
        my $size = $params{size} || $imgdefaults{$params{page}}->{size} || 'full';
        my $alt = $params{alt} || $imgdefaults{$params{page}}->{alt} || '';
+       my $title = $params{title} || $imgdefaults{$params{page}}->{title} || '';
 
        if ($image eq 'defaults') {
                $imgdefaults{$params{page}} = {
                        size => $size,
                        alt => $alt,
+                       title => $title,
                };
                return '';
        }
@@ -39,7 +41,7 @@ sub preprocess (@) { #{{{
 
        my $file = bestlink($params{page}, $image);
 
-       my $dir = $params{destpage};
+       my $dir = $params{page};
        my $base = IkiWiki::basename($file);
 
        eval q{use Image::Magick};
@@ -56,7 +58,7 @@ sub preprocess (@) { #{{{
                my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
                $imglink = "$dir/${w}x${h}-$base";
                
-               will_render($params{destpage}, $imglink);
+               will_render($params{page}, $imglink);
 
                if (-e $outfile && (-M srcfile($file) >= -M $outfile)) {
                        $r = $im->Read($outfile);
@@ -104,6 +106,7 @@ sub preprocess (@) { #{{{
        my $imgtag='<img src="'.$imgurl.
                '" alt="'.$alt.'" width="'.$im->Get("width").
                '" height="'.$im->Get("height").'"'.
+               (defined $title ? ' title="'.$title.'"' : '').
                (exists $params{class} ? ' class="'.$params{class}.'"' : '').
                (exists $params{id} ? ' id="'.$params{id}.'"' : '').
                ' />';