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

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 293e140d1d5c4251775c3ff42679a2b4fbb1717e..9b282b2b94ae15a6a8900b8b875f261b6ddba468 100644 (file)
--- 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') {