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

merge from 1.0

Browse Source
This commit is contained in:
qiang.xue
2009-07-21 19:34:55 +00:00
parent b090d86fba
commit 6bf45d462e
32 changed files with 534 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/utils/CFileHelper.php
View File

@@ -196,12 +196,12 @@ class CFileHelper
{
if(function_exists('finfo_open'))
{
if($info=finfo_open(FILEINFO_MIME))
return finfo_file($info,$file);
if(($info=finfo_open(FILEINFO_MIME)) && ($result=finfo_file($info,$file))!==false)
return $result;
}
if(function_exists('mime_content_type'))
return mime_content_type($file);
if(function_exists('mime_content_type') && ($result=mime_content_type($file))!==false)
return $result;
return self::getMimeTypeByExtension($file);
}