From 39265da4f530b35569c1d859c81dfab651ef96e6 Mon Sep 17 00:00:00 2001 From: Scott Tester Date: Wed, 21 May 2014 22:24:49 +1000 Subject: [PATCH] Code style fix & CHANGELOG typo fix for bug #3522 --- framework/CHANGELOG.md | 2 +- framework/helpers/BaseFileHelper.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index 31d2ce1020..b46bdf837d 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -28,6 +28,7 @@ Yii Framework 2 Change Log - Bug #3431: Allow using extended ErrorHandler class from the app namespace (cebe) - Bug #3436: Fixed the issue that `ServiceLocator` still returns the old component after calling `set()` with a new definition (qiangxue) - Bug #3458: Fixed the bug that the image rendered by `CaptchaAction` was using a wrong content type (MDMunir, qiangxue) +- Bug #3522: Fixed BaseFileHelper::normalizePath to allow a (.) for the current path. (skotos) - Bug: Fixed inconsistent return of `\yii\console\Application::runAction()` (samdark) - Enh #2264: `CookieCollection::has()` will return false for expired or removed cookies (qiangxue) - Enh #2435: `yii\db\IntegrityException` is now thrown on database integrity errors instead of general `yii\db\Exception` (samdark) @@ -132,7 +133,6 @@ Yii Framework 2 Change Log - Bug #2848: Individual queries should be enclosed within parenthesis in a UNION query (qiangxue) - Bug #2862: Using `DbCache` while enabling schema caching may cause infinite loops (qiangxue) - Bug #3052: Fixed the issue that cache dependency data is not reused when `reusable` is set true (qiangxue) -- Bug #3522: Fixed BaseFileHelper::normalizePath to allow a (.) for the current path. - Bug: Fixed `Call to a member function registerAssetFiles() on a non-object` in case of wrong `sourcePath` for an asset bundle (samdark) - Bug: Fixed incorrect event name for `yii\jui\Spinner` (samdark) - Bug: Json::encode() did not handle objects that implement JsonSerializable interface correctly (cebe) diff --git a/framework/helpers/BaseFileHelper.php b/framework/helpers/BaseFileHelper.php index 881934d33c..e37c1d0e9c 100644 --- a/framework/helpers/BaseFileHelper.php +++ b/framework/helpers/BaseFileHelper.php @@ -58,7 +58,7 @@ class BaseFileHelper $parts[] = $part; } } - if (count($parts)>1 && $parts[0] === '.') { + if (count($parts) > 1 && $parts[0] === '.') { array_shift($parts); } return implode($ds, $parts);