sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8071 from nextcloud/remove-silly-code 

Cleanup unused code
pull/8079/head
Morris Jobke 2018-01-26 15:47:06 +07:00 committed by GitHub
parent c67736a542 c005fc6755
commit 97c216ea06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/dav/lib/Connector/Sabre/TagsPlugin.php
Unescape Escape View File

@ -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);
});

2
apps/files_trashbin/lib/Trashbin.php
Unescape Escape View File

@ -635,8 +635,6 @@ class Trashbin {
if ($timestamp) {
$filename = $filename . '.d' . $timestamp;
} else {
$filename = $filename;
}
$target = Filesystem::normalizePath('files_trashbin/files/' . $filename);

3
lib/private/Files/ObjectStore/ObjectStoreStorage.php
Unescape Escape View File

@ -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;