* Only try postsignin if no other action matched. Fixes a bug where the

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

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index cff9dabf082f3429e1bc6937aba9ed86ec9d00d4..88a3d7b4d6f299a4f46efceb21a6cac75f73fbf6 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -62,7 +62,7 @@ sub preprocess (@) { #{{{
                        return "[[img ".sprintf(gettext("failed to read %s: %s"), $file, $r)."]]" if $r;
 
                        $r = $im->Resize(geometry => "${w}x${h}");
-                       return "[[img ".sprinftf(gettext("failed to resize: %s"), $r)."]]" if $r;
+                       return "[[img ".sprintf(gettext("failed to resize: %s"), $r)."]]" if $r;
 
                        # don't actually write file in preview mode
                        if (! $params{preview}) {
@@ -96,12 +96,28 @@ 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>';
+       }
+       elsif ($params{link} =~ /^\w+:\/\//) {
+               return  '<a href="'.$params{link}.'">'.$imgtag.'</a>';
+       }
+       elsif (length bestlink($params{page}, $params{link})) {
+               add_depends($params{page}, $params{link});
+               return htmllink($params{page}, $params{destpage},
+                       $params{link}, linktext => $imgtag,
+                       noimageinline => 1);
+       }
+       else {
+               return $imgtag;
+       }
 } #}}}
 
 1