Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 494fe2335fc6de1d3723c97efc2d73ecc17b0a20..740c44f96045e19e5ed4f79dcca8db4369feeae6 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -39,7 +39,7 @@ sub allowed {
        $allowed = ['jpeg', 'png', 'gif', 'svg'] unless defined $allowed && @$allowed;
 
        foreach my $a (@$allowed) {
        $allowed = ['jpeg', 'png', 'gif', 'svg'] unless defined $allowed && @$allowed;
 
        foreach my $a (@$allowed) {

-               return 1 if $a eq $format || $a eq 'everything';
+               return 1 if lc($a) eq $format || lc($a) eq 'everything';

        }
 
        return 0;
        }
 
        return 0;


@@ -89,7 +89,7 @@ sub preprocess (@) {
        my $extension;
        my $format;
 
        my $extension;
        my $format;
 

-       if ($base =~ m/\.([a-z0-9]+)$/) {
+       if ($base =~ m/\.([a-z0-9]+)$/is) {

                $extension = $1;
        }
        else {
                $extension = $1;
        }
        else {