Merge branch '1.0' into 2.0

This commit is contained in:
terrafrost 2016-04-11 15:18:50 -05:00
commit 076c69fa1b

View File

@ -750,7 +750,7 @@ class SFTP extends SSH2
{
$files = $this->_list($dir, false);
if (!$recursive) {
if (!$recursive || $files === false) {
return $files;
}