Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / plugins / filecheck / discussion.mdwn

diff --git a/doc/plugins/filecheck/discussion.mdwn b/doc/plugins/filecheck/discussion.mdwn
index 6f01a5c00dd0102357ff3cd96cd7de10074a213e..f91950b7df39a894c63f54991c885f019cde73c1 100644 (file)
--- a/doc/plugins/filecheck/discussion.mdwn
+++ b/doc/plugins/filecheck/discussion.mdwn
@@ -6,3 +6,12 @@ There is a heuristic ::default that decides between text/plain and application/o
 
 Would you be receptive to a patch that e.g. called File::MimeInfo::Magic::default()
 if ::magic() returns undef?  --[[DavidBremner]]
 
 Would you be receptive to a patch that e.g. called File::MimeInfo::Magic::default()
 if ::magic() returns undef?  --[[DavidBremner]]

+
+> Yes, that looks to be ok. --[[Joey]]
+
+>> OK, here is such a patch. One modification of previous behaviour is that 
+>> that if default returns undef, this is returned. As far as I understand
+>> the code/doc for File::MimeInfo, under is used only as an error return
+>> for ::default
+
+>>> Applied