From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 17 Sep 2020 06:58:10 +0000 (+0200)
Subject: Fix variable name and add spaces around path in info log line
X-Git-Tag: v20.0.0RC1~6^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F22898%2Fhead;p=nextcloud-server.git

Fix variable name and add spaces around path in info log line

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---

diff --git a/apps/files_sharing/lib/SharedStorage.php b/apps/files_sharing/lib/SharedStorage.php
index 1735cab43f6..849736d70ac 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 9cf154e9bfd..2064b7d664f 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);
 		}