Merge branch '1.0' into 2.0

This commit is contained in:
terrafrost 2019-06-16 11:03:37 -05:00
commit 0932fb3054

View File

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