From 77a2267dcfb103b63a675e4a2226076166b29d3f Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 10 Sep 2014 09:00:20 +0100 Subject: [PATCH] filecheck: accept MIME types that don't contain ';' --- IkiWiki/Plugin/filecheck.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm index cdea5c706..6e6528398 100644 --- a/IkiWiki/Plugin/filecheck.pm +++ b/IkiWiki/Plugin/filecheck.pm @@ -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) {