Signed-off-by: Morris Jobke <hey@morrisjobke.de>tags/v20.0.0RC1
@@ -305,9 +305,9 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto | |||
$this->init(); | |||
$isPartFile = pathinfo($path1, PATHINFO_EXTENSION) === 'part'; | |||
$targetExists = $this->file_exists($path2); | |||
$sameFodler = dirname($path1) === dirname($path2); | |||
$sameFolder = dirname($path1) === dirname($path2); | |||
if ($targetExists || ($sameFodler && !$isPartFile)) { | |||
if ($targetExists || ($sameFolder && !$isPartFile)) { | |||
if (!$this->isUpdatable('')) { | |||
return false; | |||
} |
@@ -100,8 +100,8 @@ class Storage extends Wrapper { | |||
} catch (GenericEncryptionException $e) { | |||
// in case of a encryption exception we delete the file right away | |||
$this->logger->info( | |||
"Can't move file" . $path . | |||
"to the trash bin, therefore it was deleted right away"); | |||
"Can't move file " . $path . | |||
" to the trash bin, therefore it was deleted right away"); | |||
return $this->storage->unlink($path); | |||
} |