diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2012-05-01 20:07:36 +0200 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2012-05-01 20:07:36 +0200 |
| commit | ab584719049965f78d244879ce2a400a1955eec6 (patch) | |
| tree | 9b949b30918022d7364eeefa07055a8a458a90a1 /apps | |
| parent | 1a2bbd2ee49db8ec2c83b87718c943f47f91be28 (diff) | |
| parent | 20f3875f1b5b319f9b35524787e67895da8acd02 (diff) | |
| download | nextcloud-server-ab584719049965f78d244879ce2a400a1955eec6.tar.gz nextcloud-server-ab584719049965f78d244879ce2a400a1955eec6.zip | |
Merge branch 'master' of gitorious.org:owncloud/owncloud
Diffstat (limited to 'apps')
| -rwxr-xr-x | apps/files_sharing/ajax/email.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_sharing/ajax/email.php b/apps/files_sharing/ajax/email.php index c0835f4946e..b74e163b841 100755 --- a/apps/files_sharing/ajax/email.php +++ b/apps/files_sharing/ajax/email.php @@ -6,7 +6,7 @@ $user = OCP\USER::getUser(); $subject = $user + ' ' + 'shared a file with you'; $link = $_POST['link'] + '&f=' + $_POST['f']; $text = $user + ' ' + 'shared the file' + ' ' + $_POST['f'] + ' ' + 'with you.' + ' ' + 'It is available for download here:' + ' ' + $link; -$fromaddress = OC_Preferences::getValue($user, 'settings', 'email', 'owncloud.org'); +$fromaddress = OC_Preferences::getValue($user, 'settings', 'email', 'sharing-noreply@'.$_SERVER['HTTP_HOST']); OC_Mail::send($_POST['toaddress'], $_POST['toaddress'], $subject, $text, $fromaddress, $user); ?>
\ No newline at end of file |