summaryrefslogtreecommitdiffstats
path: root/apps/dav/lib/Connector
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2016-02-27 00:59:46 +0100
committerVincent Petry <pvince81@owncloud.com>2016-05-20 16:22:13 +0200
commit2b30136ae9286026af4c8be8f0311f39bbedff06 (patch)
tree7c437dc0baa36efb6a07fde87f8a6c8b3fdad9d1 /apps/dav/lib/Connector
parent59a85a4c76b80658d9373e3acf4f71b872b244a0 (diff)
downloadnextcloud-server-2b30136ae9286026af4c8be8f0311f39bbedff06.tar.gz
nextcloud-server-2b30136ae9286026af4c8be8f0311f39bbedff06.zip
ensure comments-href returns a value also when propfind is done against remote.php/files
Diffstat (limited to 'apps/dav/lib/Connector')
-rw-r--r--apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php b/apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php
index a8d5f771122..e9559e361b8 100644
--- a/apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php
@@ -99,13 +99,13 @@ class CommentPropertiesPlugin extends ServerPlugin {
*/
public function getCommentsLink(Node $node) {
$href = $this->server->getBaseUri();
- $entryPoint = strrpos($href, '/webdav/');
+ $entryPoint = strpos($href, '/remote.php/');
if($entryPoint === false) {
// in case we end up somewhere else, unexpectedly.
return null;
}
- $href = substr_replace($href, '/dav/', $entryPoint);
- $href .= 'comments/files/' . rawurldecode($node->getId());
+ $commentsPart = 'dav/comments/files/' . rawurldecode($node->getId());
+ $href = substr_replace($href, $commentsPart, $entryPoint + strlen('/remote.php/'));
return $href;
}