diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2016-05-04 15:26:30 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2016-05-20 21:15:11 +0200 |
| commit | d23df4cba770c9b49bb6c7820cc865a137667922 (patch) | |
| tree | 7657db0a6251426cc3ecccec8228ee9040aa1fbd /apps/files_sharing | |
| parent | 8f87e1104d37063ff561a69348f725a2b907b9f5 (diff) | |
| download | nextcloud-server-d23df4cba770c9b49bb6c7820cc865a137667922.tar.gz nextcloud-server-d23df4cba770c9b49bb6c7820cc865a137667922.zip | |
create re-share by owner and propagate unshare and unshare-from self request
correctly accross share owner and share initiator
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/lib/notifier.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/apps/files_sharing/lib/notifier.php b/apps/files_sharing/lib/notifier.php index 27e4e2565f2..aab31f07570 100644 --- a/apps/files_sharing/lib/notifier.php +++ b/apps/files_sharing/lib/notifier.php @@ -54,9 +54,15 @@ class Notifier implements INotifier { // Deal with known subjects case 'remote_share': $params = $notification->getSubjectParameters(); - $notification->setParsedSubject( - (string) $l->t('You received "/%2$s" as a remote share from %1$s', $params) - ); + if ($params[0] !== $params[1] && $params[1] !== null) { + $notification->setParsedSubject( + (string) $l->t('You received "/%3$s" as a remote share from %1$s (on behalf of %2$s)', $params) + ); + } else { + $notification->setParsedSubject( + (string)$l->t('You received "/%3$s" as a remote share from %1$s', $params) + ); + } // Deal with the actions for a known subject foreach ($notification->getActions() as $action) { |