diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2016-02-27 00:59:46 +0100 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2016-05-20 16:22:13 +0200 |
| commit | 2b30136ae9286026af4c8be8f0311f39bbedff06 (patch) | |
| tree | 7c437dc0baa36efb6a07fde87f8a6c8b3fdad9d1 /apps/dav | |
| parent | 59a85a4c76b80658d9373e3acf4f71b872b244a0 (diff) | |
| download | nextcloud-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')
| -rw-r--r-- | apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php | 6 | ||||
| -rw-r--r-- | apps/dav/tests/unit/connector/sabre/commentpropertiesplugin.php | 3 |
2 files changed, 5 insertions, 4 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; } diff --git a/apps/dav/tests/unit/connector/sabre/commentpropertiesplugin.php b/apps/dav/tests/unit/connector/sabre/commentpropertiesplugin.php index f915c83c4a7..f7f87e01544 100644 --- a/apps/dav/tests/unit/connector/sabre/commentpropertiesplugin.php +++ b/apps/dav/tests/unit/connector/sabre/commentpropertiesplugin.php @@ -84,7 +84,8 @@ class CommentsPropertiesPlugin extends \Test\TestCase { public function baseUriProvider() { return [ ['owncloud/remote.php/webdav/', '4567', 'owncloud/remote.php/dav/comments/files/4567'], - ['owncloud/remote.php/wicked/', '4567', null] + ['owncloud/remote.php/files/', '4567', 'owncloud/remote.php/dav/comments/files/4567'], + ['owncloud/wicked.php/files/', '4567', null] ]; } |