Merge branch '2.1-src' into 2.1_n-src

anupamsahoo · Jun 23, 2017 · b2f28f5 · b2f28f5
2 parents 9fad2b0 + 7b6eb6b
commit b2f28f5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Changelog b/Changelog
@@ -1,4 +1,4 @@
-2017-0x-xx  Naoki Sawada  <[email protected]>
+2017-06-23  Naoki Sawada  <[email protected]>
 
 	* elFinder (2.1.25):
 		- [php] Fixed #2014 "Parse error" on PHP < 5.3

diff --git a/php/elFinderVolumeLocalFileSystem.class.php b/php/elFinderVolumeLocalFileSystem.class.php
@@ -577,7 +577,7 @@ protected function _subdirs($path) {
 				if ($dirItr->hasChildren()) {
 					$dirs = true;
 					$name = $dirItr->getSubPathName();
-					while($name) {
+					while($dirItr->valid()) {
 						if (!$this->attr($path . DIRECTORY_SEPARATOR . $name, 'read', null, true)) {
 							$dirs = false;
 							$dirItr->next();