aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-03-11 11:36:22 +0100
committerVincent Petry <pvince81@owncloud.com>2014-03-11 11:36:22 +0100
commit0e4d522dd90eec52828cab5e2c1d0ba7ea6a8f27 (patch)
treed01e606b374fa60165866f401830eaa4e3c94a10 /core
parentb0ec38e2024846e29d382e2c0cdff2c408ad209f (diff)
parent0de43f1fbe20f6cb69d14e8b07efa1e72f852464 (diff)
downloadnextcloud-server-0e4d522dd90eec52828cab5e2c1d0ba7ea6a8f27.tar.gz
nextcloud-server-0e4d522dd90eec52828cab5e2c1d0ba7ea6a8f27.zip
Merge pull request #7659 from owncloud/fix-7596
Fix 7596
Diffstat (limited to 'core')
-rw-r--r--core/ajax/share.php11
1 files changed, 9 insertions, 2 deletions
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 86ee018e388..ca1951ec9ae 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -145,10 +145,17 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
}
$result = $mailNotification->sendLinkShareMail($to_address, $file, $link, $expiration);
- if($result === true) {
+ if(empty($result)) {
\OCP\JSON::success();
} else {
- \OCP\JSON::error(array('data' => array('message' => OC_Util::sanitizeHTML($result))));
+ $l = OC_L10N::get('core');
+ OCP\JSON::error(array(
+ 'data' => array(
+ 'message' => $l->t("Couldn't send mail to following users: %s ",
+ implode(', ', $result)
+ )
+ )
+ ));
}
break;