Elide "; charset=binary" which can be returned from file::mime() from recent versions of finfo. See http://framework.zend.com/issues/browse/ZF-9383 for details. Fixes ticket #1230.

1 files changed, 4 insertions, 0 deletions

diff --git a/modules/forge/libraries/Form_Upload.php b/modules/forge/libraries/Form_Upload.php
index da48764c..eda9c8a6 100644
--- a/modules/forge/libraries/Form_Upload.php
+++ b/modules/forge/libraries/Form_Upload.php
@@ -135,6 +135,10 @@ class Form_Upload_Core extends Form_Input {
 			$mime = $this->upload['type'];
 		}
 
+                // Get rid of the ";charset=binary" that can occasionally occur and is
+                // legal via RFC2045
+                $mime = preg_replace('/; charset=binary/', '', $mime);
+
 		// Allow nothing by default
 		$allow = FALSE;