Merge branch '2.0' into 3.0

This commit is contained in:
terrafrost 2020-11-26 21:09:21 -06:00
commit afca3030c0

View File

@ -2128,7 +2128,7 @@ class SFTP extends SSH2
$res_offset = $stat['size']; $res_offset = $stat['size'];
} else { } else {
$res_offset = 0; $res_offset = 0;
if ($local_file !== false && !is_callable($local_file) ) { if ($local_file !== false && !is_callable($local_file)) {
$fp = fopen($local_file, 'wb'); $fp = fopen($local_file, 'wb');
if (!$fp) { if (!$fp) {
return false; return false;
@ -2186,7 +2186,7 @@ class SFTP extends SSH2
if ($local_file === false) { if ($local_file === false) {
$content.= $temp; $content.= $temp;
} elseif (is_callable($local_file)) { } elseif (is_callable($local_file)) {
$local_file($temp); $local_file($temp);
} else { } else {
fputs($fp, $temp); fputs($fp, $temp);
} }