add news item for ikiwiki 2.46

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

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 88a3d7b4d6f299a4f46efceb21a6cac75f73fbf6..abc7e099ace54d78ef33f919ca1ebf6eaa2ad6ba 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -22,16 +22,23 @@ 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 '';
        }
 
        push @{$links{$params{page}}}, $image;
+       # optimisation: detect scan mode, and avoid generating the image
+       if (! defined wantarray) {
+               return;
+       }
+
        my $file = bestlink($params{page}, $image);
 
        my $dir = $params{page};
@@ -99,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}.'"' : '').
                ' />';