diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-17 14:29:57 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-17 14:29:57 +0100 |
| commit | 8fb3e446107da26ac654ffc25af6814a17cb9022 (patch) | |
| tree | 13c712bfb6bc5581e3d3041647096db8bea5a717 /apps | |
| parent | 828cb08d49ae9fe6e01da53fb7373eb386743cd4 (diff) | |
| parent | 140d5f7df3c7506e55bea250c4fb1fa40c1cd10b (diff) | |
| download | nextcloud-server-8fb3e446107da26ac654ffc25af6814a17cb9022.tar.gz nextcloud-server-8fb3e446107da26ac654ffc25af6814a17cb9022.zip | |
Merge pull request #23287 from owncloud/issue-22786-absolute-paths
Fix absolute path creation for remote shares with /oc webroot
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_sharing/api/server2server.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_sharing/api/server2server.php b/apps/files_sharing/api/server2server.php index a3d58880f70..11b24d9148b 100644 --- a/apps/files_sharing/api/server2server.php +++ b/apps/files_sharing/api/server2server.php @@ -107,12 +107,12 @@ class Server2Server { $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); |