Merge branch '1.0' into 2.0

This commit is contained in:
terrafrost 2018-01-01 13:09:05 -06:00
commit d0155508e9

View File

@ -1147,7 +1147,7 @@ class SFTP extends SSH2
$temp[$dir] = array();
}
if ($i === $max) {
if (is_object($temp[$dir])) {
if (is_object($temp[$dir]) && is_object($value)) {
if (!isset($value->stat) && isset($temp[$dir]->stat)) {
$value->stat = $temp[$dir]->stat;
}