Merge branch 'ready/more-magic'
authorSimon McVittie <smcv@debian.org>
Mon, 15 Sep 2014 20:08:40 +0000 (21:08 +0100)
committerSimon McVittie <smcv@debian.org>
Mon, 15 Sep 2014 20:08:40 +0000 (21:08 +0100)
IkiWiki/Plugin/filecheck.pm

index cdea5c706f4085686bf20b5e7a09283792137c31..6e65283983b472fe26c86351fb6572ec5ae51865 100644 (file)
@@ -150,7 +150,7 @@ sub match_mimetype ($$;@) {
                chomp $mimetype;
                close $file_h;
        }
-       if (! defined $mimetype || $mimetype !~s /;.*//) {
+       if (! defined $mimetype) {
                # Fall back to default value.
                $mimetype=File::MimeInfo::Magic::default($file)
                        if $mimeinfo_ok;
@@ -158,6 +158,8 @@ sub match_mimetype ($$;@) {
                        $mimetype="unknown";
                }
        }
+       # Ignore any parameters, we only want the type itself
+       $mimetype =~ s/;.*//;
 
        my $regexp=IkiWiki::glob2re($wanted);
        if ($mimetype!~$regexp) {