diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-01-26 15:47:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-26 15:47:06 +0100 |
| commit | 97c216ea0627d72059ef7c5d714968fb11c21f78 (patch) | |
| tree | d3e89ae63be15c3438605905c78799545a519c19 /apps | |
| parent | c67736a54246dddfdbe41883527bc0d6d54067c6 (diff) | |
| parent | c005fc67551f7ae34ea083bb1f219e8a7f69cc56 (diff) | |
| download | nextcloud-server-97c216ea0627d72059ef7c5d714968fb11c21f78.tar.gz nextcloud-server-97c216ea0627d72059ef7c5d714968fb11c21f78.zip | |
Merge pull request #8071 from nextcloud/remove-silly-code
Cleanup unused code
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dav/lib/Connector/Sabre/TagsPlugin.php | 3 | ||||
| -rw-r--r-- | apps/files_trashbin/lib/Trashbin.php | 2 |
2 files changed, 1 insertions, 4 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); |