Merge pull request #10623 from owncloud/not-a-valid-resource-log-entries

Do not try to close the same resource multiple times
remotes/origin/fix-10825
Clark Tomlinson 12 years ago
commit 6523c575f3
  1. 7
      lib/private/files/view.php

@ -670,7 +670,12 @@ class View {
$source = fopen($tmpFile, 'r'); $source = fopen($tmpFile, 'r');
if ($source) { if ($source) {
$this->file_put_contents($path, $source); $this->file_put_contents($path, $source);
fclose($source); // $this->file_put_contents() might have already closed
// the resource, so we check it, before trying to close it
// to avoid messages in the error log.
if (is_resource($source)) {
fclose($source);
}
unlink($tmpFile); unlink($tmpFile);
return true; return true;
} else { } else {

Loading…
Cancel
Save