Merge branch 'hotfix/4856' into develop

Forward port #4856
zendframework · Jul 19, 2013 · a0bf7a7 · a0bf7a7
2 parents d9bfca4 + 8f9bb09
commit a0bf7a7
Showing 1 changed file with 21 additions and 21 deletions.
diff --git a/library/Zend/Validator/File/MimeType.php b/library/Zend/Validator/File/MimeType.php
@@ -101,31 +101,31 @@ public function __construct($options = null)
         } elseif (is_string($options)) {
             $this->setMimeType($options);
             $options = array();
-        }
-
-        if (isset($options['magicFile'])) {
-            $this->setMagicFile($options['magicFile']);
-            unset($options['magicFile']);
-        }
+        } elseif (is_array($options)) {
+            if (isset($options['magicFile'])) {
+                $this->setMagicFile($options['magicFile']);
+                unset($options['magicFile']);
+            }
 
-        if (isset($options['enableHeaderCheck'])) {
-            $this->enableHeaderCheck($options['enableHeaderCheck']);
-            unset($options['enableHeaderCheck']);
-        }
+            if (isset($options['enableHeaderCheck'])) {
+                $this->enableHeaderCheck($options['enableHeaderCheck']);
+                unset($options['enableHeaderCheck']);
+            }
 
-        if (array_key_exists('mimeType', $options)) {
-            $this->setMimeType($options['mimeType']);
-            unset($options['mimeType']);
-        }
+            if (array_key_exists('mimeType', $options)) {
+                $this->setMimeType($options['mimeType']);
+                unset($options['mimeType']);
+            }
 
-        // Handle cases where mimetypes are interspersed with options, or
-        // options are simply an array of mime types
-        foreach (array_keys($options) as $key) {
-            if (!is_int($key)) {
-                continue;
+            // Handle cases where mimetypes are interspersed with options, or
+            // options are simply an array of mime types
+            foreach (array_keys($options) as $key) {
+                if (!is_int($key)) {
+                    continue;
+                }
+                $this->addMimeType($options[$key]);
+                unset($options[$key]);
             }
-            $this->addMimeType($options[$key]);
-            unset($options[$key]);
         }
 
         parent::__construct($options);