From bf09fd37f55d2daeea7e277627b3c90400aa47ba Mon Sep 17 00:00:00 2001 From: "qiang.xue" Date: Mon, 2 Aug 2010 14:41:08 +0000 Subject: [PATCH] Fixed file_info issue. --- framework/utils/CFileHelper.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/framework/utils/CFileHelper.php b/framework/utils/CFileHelper.php index 88bb81f7f..6b4d2e7a7 100644 --- a/framework/utils/CFileHelper.php +++ b/framework/utils/CFileHelper.php @@ -216,7 +216,8 @@ class CFileHelper { if(function_exists('finfo_open')) { - if(($info=finfo_open(FILEINFO_MIME_TYPE,$magicFile)) && ($result=finfo_file($info,$file))!==false) + $info=$magicFile===null ? finfo_open(FILEINFO_MIME_TYPE) : finfo_open(FILEINFO_MIME_TYPE,$magicFile); + if($info && ($result=finfo_file($info,$file))!==false) return $result; }