Merge branch 'master' into php5

* master:
  Avoid calling fclose(false)
This commit is contained in:
Andreas Fischer 2014-12-03 23:08:56 +01:00
commit 632c47e55f

View File

@ -195,7 +195,6 @@ class Net_SCP
$fp = @fopen($data, 'rb'); $fp = @fopen($data, 'rb');
if (!$fp) { if (!$fp) {
fclose($fp);
return false; return false;
} }
$size = filesize($data); $size = filesize($data);