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
pull/22915/head
Morris Jobke 5 years ago committed by GitHub
commit c9639f3956
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      apps/files_sharing/lib/SharedStorage.php
  2. 4
      apps/files_trashbin/lib/Storage.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;
}

@ -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);
}

Loading…
Cancel
Save