Merge pull request #49 from Valdocco/29_sftp_scan_directory_recursive…

…_fix 29 scan directory recursive fix
Herzult · Oct 2, 2015 · 13eec7e · 13eec7e
2 parents d569d15 + 1eb2c07
commit 13eec7e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Ssh/Sftp.php b/src/Ssh/Sftp.php
@@ -288,8 +288,10 @@ private function scanDirectory($directory, $recursive)
 
                 if ($recursive) {
                     $children    = $this->scanDirectory($filename, $recursive);
-                    $files       = array_merge($files, $children[0]);
-                    $directories = array_merge($directories, $children[1]);
+                    if (is_array($children)) {
+                        $files       = array_merge($files, $children[0]);
+                        $directories = array_merge($directories, $children[1]);
+                    }
                 }
             }
         }