Fix variable name and add spaces around path in info log line
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
parent
05edd1e5d6
commit
930c97a0ef
|
@ -305,9 +305,9 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto
|
||||||
$this->init();
|
$this->init();
|
||||||
$isPartFile = pathinfo($path1, PATHINFO_EXTENSION) === 'part';
|
$isPartFile = pathinfo($path1, PATHINFO_EXTENSION) === 'part';
|
||||||
$targetExists = $this->file_exists($path2);
|
$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('')) {
|
if (!$this->isUpdatable('')) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -100,8 +100,8 @@ class Storage extends Wrapper {
|
||||||
} catch (GenericEncryptionException $e) {
|
} catch (GenericEncryptionException $e) {
|
||||||
// in case of a encryption exception we delete the file right away
|
// in case of a encryption exception we delete the file right away
|
||||||
$this->logger->info(
|
$this->logger->info(
|
||||||
"Can't move file" . $path .
|
"Can't move file " . $path .
|
||||||
"to the trash bin, therefore it was deleted right away");
|
" to the trash bin, therefore it was deleted right away");
|
||||||
|
|
||||||
return $this->storage->unlink($path);
|
return $this->storage->unlink($path);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue