From: Simon McVittie <smcv@debian.org>
Date: Mon, 15 Sep 2014 20:08:40 +0000 (+0100)
Subject: Merge branch 'ready/more-magic'
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/ea2ab6f885b97081c37f9034d8b7e12a0e34ad3e?hp=303f183d45a3095859dd453339cc5565bd1b8074

Merge branch 'ready/more-magic'
---

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) {