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

Added unit tests.

Browse Source
This commit is contained in:
resurtm
2012-09-22 01:01:28 +06:00
parent ea22489126
commit fd53ac7d8a
4 changed files with 44 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
framework/utils/CFileHelper.php
View File

@@ -248,23 +248,18 @@ class CFileHelper
*/
public static function getMimeTypeByExtension($file,$magicFile=null)
{
static $extensions, $customExtensions;
static $extensions, $customExtensions=array();
if($magicFile===null && $extensions===null)
$extensions=require(Yii::getPathOfAlias('system.utils.mimeTypes').'.php');
else if($magicFile!==null)
{
if(is_array($magicFile))
$customExtensions=$magicFile;
else if($customExtensions===null)
$customExtensions=require($magicFile);
}
else if($magicFile!==null && !isset($customExtensions[$magicFile]))
$customExtensions[$magicFile]=require($magicFile);
if(($ext=pathinfo($file, PATHINFO_EXTENSION))!=='')
{
$ext=strtolower($ext);
if(isset($extensions[$ext]))
if($magicFile===null && isset($extensions[$ext]))
return $extensions[$ext];
else if(isset($customExtensions[$ext]))
return $customExtensions[$ext];
else if($magicFile!==null && isset($customExtensions[$magicFile][$ext]))
return $customExtensions[$magicFile][$ext];
}
return null;
}