fix mail subject; don't show time for expire date

remotes/origin/stable6
Bjoern Schiessle 12 years ago
parent 029abc9c43
commit 17aa49a890
  1. 5
      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') {

Loading…
Cancel
Save