diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-09-17 11:55:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-17 11:55:07 +0200 |
| commit | c9639f3956e4591f57718d3f2be512e4cdfd2bba (patch) | |
| tree | 40f18c719e7356a0eee67a8fd0da30793fbbbec5 | |
| parent | d144a84df128407c41eb291db8d4f24e738a7034 (diff) | |
| parent | 930c97a0ef0f01751f6f645e4506a216ef98c8a0 (diff) | |
| download | nextcloud-server-c9639f3956e4591f57718d3f2be512e4cdfd2bba.tar.gz nextcloud-server-c9639f3956e4591f57718d3f2be512e4cdfd2bba.zip | |
Merge pull request #22898 from nextcloud/fix/16696/add-spaces-and-fix-variable-name
Fix variable name and add spaces around path in info log line
| -rw-r--r-- | apps/files_sharing/lib/SharedStorage.php | 4 | ||||
| -rw-r--r-- | 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 d7c9a8081dd..901634c1e9f 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 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); } |