Mirrors/yii
2
0
Fork 0
mirror of https://github.com/yiisoft/yii.git synced 2026-03-12 02:56:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

(Fixes issue 1851) CFileHelper::getMimeType() was causing an error if used with PHP 5.2 and PECL fileinfo extension

Browse Source
This commit is contained in:
alexander.makarow
2010-12-08 18:16:40 +00:00
parent bda2438797
commit 5a63cdd657
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/utils/CFileHelper.php
View File

@@ -218,7 +218,9 @@ class CFileHelper
{
if(function_exists('finfo_open'))
{
$info=$magicFile===null ? finfo_open(FILEINFO_MIME_TYPE) : finfo_open(FILEINFO_MIME_TYPE,$magicFile);
$options=defined('FILEINFO_MIME_TYPE') ? FILEINFO_MIME_TYPE : FILEINFO_MIME;
$info=$magicFile===null ? finfo_open($options) : finfo_open($options,$magicFile);
if($info && ($result=finfo_file($info,$file))!==false)
return $result;
}