summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-01-26 15:25:19 +0100
committerMorris Jobke <hey@morrisjobke.de>2018-01-26 15:25:19 +0100
commitc005fc67551f7ae34ea083bb1f219e8a7f69cc56 (patch)
tree2bb111762c853fb635846f809e2adb9bd34f46d2 /apps
parentca493ab5b1288d53f203d74117a8e636a606e633 (diff)
downloadnextcloud-server-c005fc67551f7ae34ea083bb1f219e8a7f69cc56.tar.gz
nextcloud-server-c005fc67551f7ae34ea083bb1f219e8a7f69cc56.zip
Cleanup unused code
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'apps')
-rw-r--r--apps/dav/lib/Connector/Sabre/TagsPlugin.php3
-rw-r--r--apps/files_trashbin/lib/Trashbin.php2
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);