Merge branch '1.0' into 2.0

This commit is contained in:
terrafrost 2016-11-20 18:04:55 -06:00
commit 27a6b6362a

View File

@ -2180,7 +2180,12 @@ class SFTP extends SSH2
return false;
}
if (empty($path)) {
if (is_object($path)) {
// It's an object. Cast it as string before we check anything else.
$path = (string) $path;
}
if (!is_string($path) || $path == '') {
return false;
}