Merge branch '2.0'

This commit is contained in:
terrafrost 2019-06-16 11:04:31 -05:00
commit aa8a30cd81

View File

@ -800,6 +800,7 @@ class SFTP extends SSH2
} }
if (is_array($this->query_stat_cache($this->realpath($dir . '/' . $value)))) { if (is_array($this->query_stat_cache($this->realpath($dir . '/' . $value)))) {
$temp = $this->nlist_helper($dir . '/' . $value, true, $relativeDir . $value . '/'); $temp = $this->nlist_helper($dir . '/' . $value, true, $relativeDir . $value . '/');
$temp = is_array($temp) ? $temp : [];
$result = array_merge($result, $temp); $result = array_merge($result, $temp);
} else { } else {
$result[] = $relativeDir . $value; $result[] = $relativeDir . $value;