Skip to content

Commit

Permalink
Merge pull request #23287 from owncloud/issue-22786-absolute-paths
Browse files Browse the repository at this point in the history
Fix absolute path creation for remote shares with /oc webroot
  • Loading branch information
DeepDiver1975 committed Mar 17, 2016
2 parents 828cb08 + 140d5f7 commit 8fb3e44
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions apps/files_sharing/api/server2server.php
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,12 @@ public function createShare($params) {

$declineAction = $notification->createAction();
$declineAction->setLabel('decline')
->setLink($urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId), 'DELETE');
->setLink($urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId)), 'DELETE');
$notification->addAction($declineAction);

$acceptAction = $notification->createAction();
$acceptAction->setLabel('accept')
->setLink($urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId), 'POST');
->setLink($urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId)), 'POST');
$notification->addAction($acceptAction);

$notificationManager->notify($notification);
Expand Down

0 comments on commit 8fb3e44

Please sign in to comment.