php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-18 17:21:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

"StringHelper::basename()" has been replaced by plain "basename" at "FileHelper".

Browse Source
This commit is contained in:
Paul Klimov
2013-06-11 10:52:31 +03:00
parent 40a005d543
commit dc8c71f409
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/yii/helpers/base/FileHelper.php
View File

@ -67,7 +67,7 @@ class FileHelper
if ($language === $sourceLanguage) { if ($language === $sourceLanguage) {
return $file; return $file;
} }
$desiredFile = dirname($file) . DIRECTORY_SEPARATOR . $sourceLanguage . DIRECTORY_SEPARATOR . StringHelper::basename($file); $desiredFile = dirname($file) . DIRECTORY_SEPARATOR . $sourceLanguage . DIRECTORY_SEPARATOR . basename($file);
return is_file($desiredFile) ? $desiredFile : $file; return is_file($desiredFile) ? $desiredFile : $file;
} }
@ -179,7 +179,7 @@ class FileHelper
{ {
$items = glob($dir . DIRECTORY_SEPARATOR . '{,.}*', GLOB_MARK | GLOB_BRACE); $items = glob($dir . DIRECTORY_SEPARATOR . '{,.}*', GLOB_MARK | GLOB_BRACE);
foreach ($items as $item) { foreach ($items as $item) {
$itemBaseName = StringHelper::basename($item); $itemBaseName = basename($item);
if ($itemBaseName === '.' || $itemBaseName === '..') { if ($itemBaseName === '.' || $itemBaseName === '..') {
continue; continue;
} }