diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index f3f5041ef1..a9da5906c1 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -4,6 +4,7 @@ Yii Framework 2 Change Log 2.0.16 under development ------------------------ +- Bug #16183: Fixed when `yii\helpers\BaseFileHelper` sometimes returned wrong value (samdark, SilverFire, OndrejVasicek) - Bug #13932: Fix number validator attributes comparison (uaoleg, s1lver) - Bug #14039, #16636: Fixed validation for disabled inputs (s1lver, omzy83) - Bug #16425: Check for additional values for disabled confirm dialog (Alex-Code, s1lver) diff --git a/framework/helpers/BaseFileHelper.php b/framework/helpers/BaseFileHelper.php index 026090f8f8..2c1cbbc95e 100644 --- a/framework/helpers/BaseFileHelper.php +++ b/framework/helpers/BaseFileHelper.php @@ -415,9 +415,13 @@ class BaseFileHelper return unlink($path); } catch (ErrorException $e) { // last resort measure for Windows - $lines = []; - exec('DEL /F/Q ' . escapeshellarg($path), $lines, $deleteError); - return $deleteError !== 0; + if (function_exists('exec') && file_exists($path)) { + exec('DEL /F/Q ' . escapeshellarg($path)); + + return !file_exists($path); + } + + return false; } }