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

Merge pull request #14101 from nextcloud/backport/14083/stable15 

[stable15] Make sure the relative path is always a string
This commit is contained in:
Joas Schilling 2019-02-08 08:41:41 +01:00 committed by GitHub
parent 8660fc3502 c29520013c
commit 7fc115d0a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apps/sharebymail/lib/ShareByMailProvider.php
View File

@ -254,7 +254,7 @@ class ShareByMailProvider implements IShareProvider {
[$userFolder->getRelativePath($share->getNode()->getPath()), $share->getSharedWith()],
$share->getSharedBy(),
$share->getNode()->getId(),
$userFolder->getRelativePath($share->getNode()->getPath())
(string) $userFolder->getRelativePath($share->getNode()->getPath())
);
if ($share->getShareOwner() !== $share->getSharedBy()) {
@ -264,11 +264,10 @@ class ShareByMailProvider implements IShareProvider {
$ownerPath = $nodes[0]->getPath();
$this->publishActivity(
$type === 'share' ? Activity::SUBJECT_SHARED_EMAIL_BY : Activity::SUBJECT_UNSHARED_EMAIL_BY,
Activity::SUBJECT_SHARED_EMAIL_BY,
[$ownerFolder->getRelativePath($ownerPath), $share->getSharedWith(), $share->getSharedBy()],
$share->getShareOwner(),
$fileId,
$ownerFolder->getRelativePath($ownerPath)
(string) $ownerFolder->getRelativePath($ownerPath)
);
}
@ -291,7 +290,7 @@ class ShareByMailProvider implements IShareProvider {
[$userFolder->getRelativePath($share->getNode()->getPath())],
$share->getSharedBy(),
$share->getNode()->getId(),
$userFolder->getRelativePath($share->getNode()->getPath())
(string) $userFolder->getRelativePath($share->getNode()->getPath())
);
} else {
$this->publishActivity(
@ -299,7 +298,7 @@ class ShareByMailProvider implements IShareProvider {
[$userFolder->getRelativePath($share->getNode()->getPath()), $sharedWith],
$share->getSharedBy(),
$share->getNode()->getId(),
$userFolder->getRelativePath($share->getNode()->getPath())
(string) $userFolder->getRelativePath($share->getNode()->getPath())
);
}
}
@ -308,13 +307,13 @@ class ShareByMailProvider implements IShareProvider {
/**
* publish activity if a file/folder was shared by mail
*
* @param $subject
* @param $parameters
* @param $affectedUser
* @param $fileId
* @param $filePath
* @param string $subject
* @param array $parameters
* @param string $affectedUser
* @param int $fileId
* @param string $filePath
*/
protected function publishActivity($subject, $parameters, $affectedUser, $fileId, $filePath) {
protected function publishActivity(string $subject, array $parameters, string $affectedUser, int $fileId, string $filePath) {
$event = $this->activityManager->generateEvent();
$event->setApp('sharebymail')
->setType('shared')