summaryrefslogtreecommitdiffstats
path: root/core/ajax
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2013-09-30 13:33:02 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2013-09-30 13:33:02 +0200
commit17aa49a890195f8482e527f2b8c102238d94bc7c (patch)
tree3ce59d8fe3d1a28260195a47b9b7c9e574ed70a0 /core/ajax
parent029abc9c43d1d396d8cd4301542c89e1023fa553 (diff)
downloadnextcloud-server-17aa49a890195f8482e527f2b8c102238d94bc7c.tar.gz
nextcloud-server-17aa49a890195f8482e527f2b8c102238d94bc7c.zip
fix mail subject; don't show time for expire date
Diffstat (limited to 'core/ajax')
-rw-r--r--core/ajax/share.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 293e140d1d5..9b282b2b94a 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -115,10 +115,11 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
$displayName = \OCP\User::getDisplayName($recipient);
$items = \OCP\Share::getItemSharedWithUser($itemType, $itemSource, $recipient);
$filename = trim($items[0]['file_target'], '/');
- $subject = $defaults->getShareNotificationSubject($ownerDisplayName, $filename);
+ $subject = (string)$l->t('%s shared »%s« with you', array($ownerDisplayName, $filename));
$expiration = null;
if (isset($items[0]['expiration'])) {
- $expiration = $items[0]['expiration'];
+ $date = new DateTime($items[0]['expiration']);
+ $expiration = $date->format('Y-m-d');
}
if ($itemType === 'folder') {