Skip to content

Commit 13eec7e

Browse files
committed
Merge pull request #49 from Valdocco/29_sftp_scan_directory_recursive_fix
29 scan directory recursive fix
2 parents d569d15 + 1eb2c07 commit 13eec7e

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/Ssh/Sftp.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,10 @@ private function scanDirectory($directory, $recursive)
288288

289289
if ($recursive) {
290290
$children = $this->scanDirectory($filename, $recursive);
291-
$files = array_merge($files, $children[0]);
292-
$directories = array_merge($directories, $children[1]);
291+
if (is_array($children)) {
292+
$files = array_merge($files, $children[0]);
293+
$directories = array_merge($directories, $children[1]);
294+
}
293295
}
294296
}
295297
}

0 commit comments

Comments
 (0)