From dc8c71f409ff8d680ec0fed277e65fc620d65c0b Mon Sep 17 00:00:00 2001 From: Paul Klimov Date: Tue, 11 Jun 2013 10:52:31 +0300 Subject: [PATCH] "StringHelper::basename()" has been replaced by plain "basename" at "FileHelper". --- framework/yii/helpers/base/FileHelper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/yii/helpers/base/FileHelper.php b/framework/yii/helpers/base/FileHelper.php index 72f6d18..dc8aca6 100644 --- a/framework/yii/helpers/base/FileHelper.php +++ b/framework/yii/helpers/base/FileHelper.php @@ -67,7 +67,7 @@ class FileHelper if ($language === $sourceLanguage) { 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; } @@ -179,7 +179,7 @@ class FileHelper { $items = glob($dir . DIRECTORY_SEPARATOR . '{,.}*', GLOB_MARK | GLOB_BRACE); foreach ($items as $item) { - $itemBaseName = StringHelper::basename($item); + $itemBaseName = basename($item); if ($itemBaseName === '.' || $itemBaseName === '..') { continue; }