cherry-pick uri security fix

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

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index c4e4a6f220beae57c19c239db73fa1ee624cd678..b6e7c9e41db20db9639ec7927a2994a0560a799e 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -32,6 +32,11 @@ sub preprocess (@) { #{{{
        }
 
        push @{$links{$params{page}}}, $image;
        }
 
        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};
        my $file = bestlink($params{page}, $image);
 
        my $dir = $params{page};


@@ -106,6 +111,15 @@ 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})) {
+               add_depends($params{page}, $params{link});
+               return htmllink($params{page}, $params{destpage},
+                       $params{link}, linktext => $imgtag,
+                       noimageinline => 1);
+       }

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