From 930c97a0ef0f01751f6f645e4506a216ef98c8a0 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 17 Sep 2020 08:58:10 +0200 Subject: [PATCH] Fix variable name and add spaces around path in info log line Signed-off-by: Morris Jobke --- apps/files_sharing/lib/SharedStorage.php | 4 ++-- apps/files_trashbin/lib/Storage.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/files_sharing/lib/SharedStorage.php b/apps/files_sharing/lib/SharedStorage.php index 1735cab43f..849736d70a 100644 --- a/apps/files_sharing/lib/SharedStorage.php +++ b/apps/files_sharing/lib/SharedStorage.php @@ -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; } diff --git a/apps/files_trashbin/lib/Storage.php b/apps/files_trashbin/lib/Storage.php index 9cf154e9bf..2064b7d664 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); }