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 9992f2c2699371eb39ddb86776bba6c18c7a3562..cdea5c706f4085686bf20b5e7a09283792137c31 100644 (file)
--- 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 a865d311c824582d5c5167d367cfab68f9a3385a..3e6075631856dd5cd833d44118a236d8090b43a7 100644 (file)
--- 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 8be0d84dab65936c1cee4511b925e56e4c1d723c..e93f4e5460392ae3ab5bb45d58b8eb05d8983ebd 100644 (file)
--- 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]]