diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/share/share.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/private/share/share.php b/lib/private/share/share.php index abb9ec3cb99..f2ba33bd16b 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -619,10 +619,13 @@ class Share extends Constants { if (is_null($itemSourceName)) { $itemSourceName = $itemSource; } + $itemName = $itemSourceName; // check if file can be shared if ($itemType === 'file' or $itemType === 'folder') { $path = \OC\Files\Filesystem::getPath($itemSource); + $itemName = $path; + // verify that the file exists before we try to share it if (!$path) { $message = 'Sharing %s failed, because the file does not exist'; @@ -677,9 +680,9 @@ class Share extends Constants { // Verify share type and sharing conditions are met if ($shareType === self::SHARE_TYPE_USER) { if ($shareWith == $uidOwner) { - $message = 'Sharing %s failed, because the user %s is the item owner'; - $message_t = $l->t('Sharing %s failed, because the user %s is the item owner', array($itemSourceName, $shareWith)); - \OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::DEBUG); + $message = 'Sharing %s failed, because you can not share with yourself'; + $message_t = $l->t('Sharing %s failed, because you can not share with yourself', [$itemName]); + \OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName), \OCP\Util::DEBUG); throw new \Exception($message_t); } if (!\OC_User::userExists($shareWith)) { @@ -2209,7 +2212,7 @@ class Share extends Constants { // Check if attempting to share back to owner if ($checkReshare['uid_owner'] == $shareWith && $shareType == self::SHARE_TYPE_USER) { $message = 'Sharing %s failed, because the user %s is the original sharer'; - $message_t = $l->t('Sharing %s failed, because the user %s is the original sharer', array($itemSourceName, $shareWith)); + $message_t = $l->t('Sharing failed, because the user %s is the original sharer', [$shareWith]); \OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::DEBUG); throw new \Exception($message_t); |