X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/dadc8222954332e4ea0266dd2645d5758e125114..36f5e63d7310495f0997b95f8058c3c518a1341d:/IkiWiki/Plugin/filecheck.pm

diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm
index 9992f2c26..6e6528398 100644
--- a/IkiWiki/Plugin/filecheck.pm
+++ b/IkiWiki/Plugin/filecheck.pm
@@ -139,7 +139,7 @@ sub match_mimetype ($$;@) {
 	my $mimeinfo_ok=! $@;
 	my $mimetype;
 	if ($mimeinfo_ok) {
-		my $mimetype=File::MimeInfo::Magic::magic($file);
+		$mimetype=File::MimeInfo::Magic::magic($file);
 	}
 
 	# Fall back to using file, which has a more complete
@@ -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) {