* 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 14a32f63542fb827e40ff926771982436e02f59a..88a3d7b4d6f299a4f46efceb21a6cac75f73fbf6 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -106,9 +106,14 @@ sub preprocess (@) { #{{{
        if (! defined $params{link} || lc($params{link}) eq 'yes') {
                return  '<a href="'.$fileurl.'">'.$imgtag.'</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})) {
        elsif (length bestlink($params{page}, $params{link})) {

+               add_depends($params{page}, $params{link});

                return htmllink($params{page}, $params{destpage},
                return htmllink($params{page}, $params{destpage},

-                       $params{link}, linktext => $imgtag);
+                       $params{link}, linktext => $imgtag,
+                       noimageinline => 1);

        }
        else {
                return $imgtag;
        }
        else {
                return $imgtag;