Signed-off-by: Morris Jobke <hey@morrisjobke.de>tags/v14.0.0beta1
@@ -240,10 +240,9 @@ class TagsPlugin extends \Sabre\DAV\ServerPlugin | |||
} | |||
} | |||
$tags = null; | |||
$isFav = null; | |||
$propFind->handle(self::TAGS_PROPERTYNAME, function() use ($tags, &$isFav, $node) { | |||
$propFind->handle(self::TAGS_PROPERTYNAME, function() use (&$isFav, $node) { | |||
list($tags, $isFav) = $this->getTagsAndFav($node->getId()); | |||
return new TagList($tags); | |||
}); |
@@ -635,8 +635,6 @@ class Trashbin { | |||
if ($timestamp) { | |||
$filename = $filename . '.d' . $timestamp; | |||
} else { | |||
$filename = $filename; | |||
} | |||
$target = Filesystem::normalizePath('files_trashbin/files/' . $filename); |
@@ -194,9 +194,8 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common { | |||
'message' => 'Could not delete object ' . $this->getURN($stat['fileid']) . ' for ' . $path, | |||
]); | |||
return false; | |||
} else { | |||
//removing from cache is ok as it does not exist in the objectstore anyway | |||
} | |||
//removing from cache is ok as it does not exist in the objectstore anyway | |||
} | |||
$this->getCache()->remove($path); | |||
return true; |