From: Joey Hess <joey@kitenet.net>
Date: Sun, 4 Nov 2012 16:02:26 +0000 (-0400)
Subject: filecheck: Fix bug that prevented File::MimeInfo::Magic from ever being used.
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/286026877d9e7d520cab5fde173585903b0d32a9?ds=sidebyside;hp=3b120dd7677e0197aff9e0f73fe43427d3cc1f9c

filecheck: Fix bug that prevented File::MimeInfo::Magic from ever being used.
---

diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm
index 9992f2c26..cdea5c706 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
diff --git a/debian/changelog b/debian/changelog
index a865d311c..3e6075631 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20121018) UNRELEASED; urgency=low
+
+  * filecheck: Fix bug that prevented File::MimeInfo::Magic from ever
+    being used.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 04 Nov 2012 11:59:10 -0400
+
 ikiwiki (3.20121017) unstable; urgency=low
 
   * recentchangesdiff: fix further breakage to the template from 3.20120725 
diff --git a/doc/bugs/Slow_Filecheck_attachments___34__snails_it_all__34__.mdwn b/doc/bugs/Slow_Filecheck_attachments___34__snails_it_all__34__.mdwn
index 8be0d84da..e93f4e546 100644
--- a/doc/bugs/Slow_Filecheck_attachments___34__snails_it_all__34__.mdwn
+++ b/doc/bugs/Slow_Filecheck_attachments___34__snails_it_all__34__.mdwn
@@ -42,3 +42,6 @@ I found on [[plugins/filecheck/discussion/]] what [[users/DavidBremner/]] descri
 But I can't figure out if my issue is boarder and includes this or not.. 
 
 Any ideas , solve :) more that welcome.
+
+> [[done]], as isbear noted in [[discussion]], there was a bug that
+> prevented File::MimeInfo::Magic from ever being used. --[[Joey]]