diff --git a/apps/files_sharing/lib/SharedStorage.php b/apps/files_sharing/lib/SharedStorage.php index d7c9a8081dd1c70694555e76da21d33c04f4f398..901634c1e9ff49de260226dc42adf16c8a84782b 100644 --- a/apps/files_sharing/lib/SharedStorage.php +++ b/apps/files_sharing/lib/SharedStorage.php @@ -307,9 +307,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; } diff --git a/apps/files_trashbin/lib/Storage.php b/apps/files_trashbin/lib/Storage.php index 9cf154e9bfdf4a114fbe772d4c17fa306e4a74b9..2064b7d664f2469622363c065977929168417efb 100644 --- a/apps/files_trashbin/lib/Storage.php +++ b/apps/files_trashbin/lib/Storage.php @@ -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); }