ensure comments-href returns a value also when propfind is done against remote.php/files
This commit is contained in:
parent
59a85a4c76
commit
2b30136ae9
|
@ -99,13 +99,13 @@ class CommentPropertiesPlugin extends ServerPlugin {
|
||||||
*/
|
*/
|
||||||
public function getCommentsLink(Node $node) {
|
public function getCommentsLink(Node $node) {
|
||||||
$href = $this->server->getBaseUri();
|
$href = $this->server->getBaseUri();
|
||||||
$entryPoint = strrpos($href, '/webdav/');
|
$entryPoint = strpos($href, '/remote.php/');
|
||||||
if($entryPoint === false) {
|
if($entryPoint === false) {
|
||||||
// in case we end up somewhere else, unexpectedly.
|
// in case we end up somewhere else, unexpectedly.
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
$href = substr_replace($href, '/dav/', $entryPoint);
|
$commentsPart = 'dav/comments/files/' . rawurldecode($node->getId());
|
||||||
$href .= 'comments/files/' . rawurldecode($node->getId());
|
$href = substr_replace($href, $commentsPart, $entryPoint + strlen('/remote.php/'));
|
||||||
return $href;
|
return $href;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -84,7 +84,8 @@ class CommentsPropertiesPlugin extends \Test\TestCase {
|
||||||
public function baseUriProvider() {
|
public function baseUriProvider() {
|
||||||
return [
|
return [
|
||||||
['owncloud/remote.php/webdav/', '4567', 'owncloud/remote.php/dav/comments/files/4567'],
|
['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]
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue