mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22690 from owncloud/fix-comments-href-remote.php-files 

ensure comments-href returns a value also when propfind is done again…
This commit is contained in:
Vincent Petry 2016-05-23 14:47:03 +02:00
parent 21df2eb5a1 2b30136ae9
commit c10d8a37f7
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php
View File

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

3
apps/dav/tests/unit/connector/sabre/commentpropertiesplugin.php
View File

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