diff options
| -rw-r--r-- | apps/dav/lib/Connector/Sabre/TagsPlugin.php | 3 | ||||
| -rw-r--r-- | apps/files_trashbin/lib/Trashbin.php | 2 | ||||
| -rw-r--r-- | lib/private/Files/ObjectStore/ObjectStoreStorage.php | 3 |
3 files changed, 2 insertions, 6 deletions
diff --git a/apps/dav/lib/Connector/Sabre/TagsPlugin.php b/apps/dav/lib/Connector/Sabre/TagsPlugin.php index 07e0f849a57..229826c0a7a 100644 --- a/apps/dav/lib/Connector/Sabre/TagsPlugin.php +++ b/apps/dav/lib/Connector/Sabre/TagsPlugin.php @@ -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); }); diff --git a/apps/files_trashbin/lib/Trashbin.php b/apps/files_trashbin/lib/Trashbin.php index d61881ce3b1..ca4b406c648 100644 --- a/apps/files_trashbin/lib/Trashbin.php +++ b/apps/files_trashbin/lib/Trashbin.php @@ -635,8 +635,6 @@ class Trashbin { if ($timestamp) { $filename = $filename . '.d' . $timestamp; - } else { - $filename = $filename; } $target = Filesystem::normalizePath('files_trashbin/files/' . $filename); diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php index acb8d670780..094a2915730 100644 --- a/lib/private/Files/ObjectStore/ObjectStoreStorage.php +++ b/lib/private/Files/ObjectStore/ObjectStoreStorage.php @@ -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; |