wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix warnings when trying to get mtime of non existing files

Browse source
This commit is contained in:
Robin Appelman 2016-06-03 13:35:27 +02:00
parent 14f96f86e7
commit 6bc8305edd
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/private/Files/Storage/Local.php
View file

@ -157,7 +157,7 @@ class Local extends \OC\Files\Storage\Common {
public function filemtime($path) { public function filemtime($path) {
clearstatcache($this->getSourcePath($path)); clearstatcache($this->getSourcePath($path));
return filemtime($this->getSourcePath($path)); return $this->file_exists($path) ? filemtime($this->getSourcePath($path)) : false;
} }
public function touch($path, $mtime = null) { public function touch($path, $mtime = null) {
@ -188,7 +188,7 @@ class Local extends \OC\Files\Storage\Common {
return ''; return '';
} }
$handle = fopen($fileName,'rb'); $handle = fopen($fileName, 'rb');
$content = fread($handle, $fileSize); $content = fread($handle, $fileSize);
fclose($handle); fclose($handle);
return $content; return $content;
@ -377,7 +377,7 @@ class Local extends \OC\Files\Storage\Common {
* @return bool * @return bool
*/ */
public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath) { public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
if($sourceStorage->instanceOfStorage('\OC\Files\Storage\Local')){ if ($sourceStorage->instanceOfStorage('\OC\Files\Storage\Local')) {
/** /**
* @var \OC\Files\Storage\Local $sourceStorage * @var \OC\Files\Storage\Local $sourceStorage
*/ */