Skip to content
This repository has been archived by the owner on May 8, 2024. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/4263'
Browse files Browse the repository at this point in the history
  • Loading branch information
weierophinney committed Apr 22, 2013
2 parents 234e119 + 11df51b commit e7127cc
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions library/Zend/Validator/File/MimeType.php
Original file line number Diff line number Diff line change
Expand Up @@ -393,9 +393,10 @@ public function isValid($value, $file = null)
}
}

if (empty($this->type) &&
(function_exists('mime_content_type') && ini_get('mime_magic.magicfile'))) {
$this->type = mime_content_type($file);
if (empty($this->type)
&& (function_exists('mime_content_type') && ini_get('mime_magic.magicfile'))
) {
$this->type = mime_content_type($file);
}

if (empty($this->type) && $this->getHeaderCheck()) {
Expand Down

0 comments on commit e7127cc

Please sign in to comment.