summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorFrank Karlitschek <frank@owncloud.org>2013-03-15 04:22:44 -0700
committerFrank Karlitschek <frank@owncloud.org>2013-03-15 04:22:44 -0700
commit761540e78b5e7ffc6cf717c71adcd8378b8f13a8 (patch)
treecad657042129ad7253b5e98449d39e226cc67904 /core
parent418fb98c4039f4a88edc545f50d38fa21a6758be (diff)
parent17cb47fbf6c5164dda3a27cb030f44557a1e3c1e (diff)
downloadnextcloud-server-761540e78b5e7ffc6cf717c71adcd8378b8f13a8.tar.gz
nextcloud-server-761540e78b5e7ffc6cf717c71adcd8378b8f13a8.zip
Merge pull request #2320 from ceri/master
Fix erroneous email when folders are shared
Diffstat (limited to 'core')
-rw-r--r--core/ajax/share.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 7ebd8949710..5854b65aa03 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -95,12 +95,12 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
// setup the email
$subject = (string)$l->t('User %s shared a file with you', $displayName);
- if ($type === 'dir')
+ if ($type === 'folder')
$subject = (string)$l->t('User %s shared a folder with you', $displayName);
$text = (string)$l->t('User %s shared the file "%s" with you. It is available for download here: %s',
array($displayName, $file, $link));
- if ($type === 'dir')
+ if ($type === 'folder')
$text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s',
array($displayName, $file, $link));