]> source.dussan.org Git - nextcloud-server.git/commitdiff
Fix variable name and add spaces around path in info log line 22898/head
authorMorris Jobke <hey@morrisjobke.de>
Thu, 17 Sep 2020 06:58:10 +0000 (08:58 +0200)
committerMorris Jobke <hey@morrisjobke.de>
Thu, 17 Sep 2020 06:58:10 +0000 (08:58 +0200)
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
apps/files_sharing/lib/SharedStorage.php
apps/files_trashbin/lib/Storage.php

index 1735cab43f6142543280ab80b0c287ab83649df0..849736d70ac5d0cb1c8449155cbc2d98767bdf1d 100644 (file)
@@ -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;
                        }
index 9cf154e9bfdf4a114fbe772d4c17fa306e4a74b9..2064b7d664f2469622363c065977929168417efb 100644 (file)
@@ -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);
                }