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

code conv fix, charset specifying and docs improvement

Browse Source
This commit is contained in:
Pavel Voronin
2013-08-14 10:23:29 +04:00
parent 1465b19469
commit a9871c68a2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/utils/CFileHelper.php
View File

@@ -100,7 +100,7 @@ class CFileHelper
* Level 0 means searching for only the files DIRECTLY under the directory;
* level N means searching for those directories that are within N levels.
* </li>
* <li>absolutePaths: boolean, whether to return absolute paths or relative ones, default=true.</li>
* <li>absolutePaths: boolean, whether to return absolute paths or relative ones, defaults to true.</li>
* </ul>
* @return array files found under the directory. The file list is sorted.
*/
@@ -113,10 +113,10 @@ class CFileHelper
extract($options);
$list=self::findFilesRecursive($dir,'',$fileTypes,$exclude,$level);
$mbstring=function_exists('mb_strlen');
$dirLen=$mbstring?mb_strlen($dir):strlen($dir);
$dirLen=$mbstring?mb_strlen($dir,Yii::app()->charset):strlen($dir);
if(!$absolutePaths)
foreach ($list as &$path)
$path=$mbstring?mb_substr($path,$dirLen+1):substr($path,$dirLen+1);
foreach($list as &$path)
$path=$mbstring?mb_substr($path,$dirLen+1,null,Yii::app()->charset):substr($path,$dirLen+1);
sort($list);
return $list;
}