Skip to content

Commit

Permalink
Fixed an issue with Filehelper and not accessable directories
Browse files Browse the repository at this point in the history
  • Loading branch information
cebe committed Jan 28, 2014
1 parent f1a674b commit f9dee9c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions framework/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ Yii Framework 2 Change Log
- Bug: Fixed the issue that query cache returns the same data for the same SQL but different query methods (qiangxue)
- Bug: Fixed URL parsing so it's now properly giving 404 for URLs like `http://example.com//////site/about` (samdark)
- Bug: Fixed `HelpController::getModuleCommands` issue where it attempts to scan a module's controller directory when it doesn't exist (jom)
- Bug: Fixed an issue with Filehelper and not accessable directories which resulted in endless loop (cebe)
- Enh #46: Added Image extension based on [Imagine library](http://imagine.readthedocs.org) (tonydspaniard)
- Enh #364: Improve Inflector::slug with `intl` transliteration. Improved transliteration char map. (tonydspaniard)
- Enh #797: Added support for validating multiple columns by `UniqueValidator` and `ExistValidator` (qiangxue)
Expand Down
6 changes: 6 additions & 0 deletions framework/helpers/BaseFileHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,9 @@ public static function copyDirectory($src, $dst, $options = [])
}

$handle = opendir($src);
if ($handle === false) {
throw new InvalidParamException('Unable to open directory: ' . $src);
}
while (($file = readdir($handle)) !== false) {
if ($file === '.' || $file === '..') {
continue;
Expand Down Expand Up @@ -293,6 +296,9 @@ public static function findFiles($dir, $options = [])
}
$list = [];
$handle = opendir($dir);
if ($handle === false) {
throw new InvalidParamException('Unable to open directory: ' . $dir);
}
while (($file = readdir($handle)) !== false) {
if ($file === '.' || $file === '..') {
continue;
Expand Down

0 comments on commit f9dee9c

Please sign in to comment.