diff options
author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-04-18 16:58:20 +0200 |
---|---|---|
committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-04-18 16:58:20 +0200 |
commit | ee1641393550eea9200f792707070e024879d466 (patch) | |
tree | ee9e19d380cdf4fee74d4b7c1fa323098c72b93b /mod/dfrn_notify.php | |
parent | 62dbfffe399333cd4a792cc77256a2bcd689a14f (diff) | |
parent | 741a262f1b2d5c8f911896da32e80d543afb5cd1 (diff) | |
download | volse-hubzilla-ee1641393550eea9200f792707070e024879d466.tar.gz volse-hubzilla-ee1641393550eea9200f792707070e024879d466.tar.bz2 volse-hubzilla-ee1641393550eea9200f792707070e024879d466.zip |
Merge remote-tracking branch 'friendika-master/master'
Diffstat (limited to 'mod/dfrn_notify.php')
-rw-r--r-- | mod/dfrn_notify.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index f6f68d348..eb9d71fe3 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -401,7 +401,11 @@ function dfrn_notify_post(&$a) { )); $res = mail($importer['email'], sprintf(t('%s commented on an item at %s'), $from , $a->config['sitename']), - $email_tpl, "From: " . t('Administrator') . '@' . $a->get_hostname() ); + $email_tpl, + 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" + . 'Content-type: text/plain; charset=UTF-8' . "\n" + . 'Content-transfer-encoding: 8bit' ); + } } xml_status(0); @@ -487,7 +491,11 @@ function dfrn_notify_post(&$a) { )); $res = mail($importer['email'], sprintf( t("%s commented on an item at %s") , $from ,$a->config['sitename']), - $email_tpl, "From: ".t("Administrator") . "@". $a->get_hostname() ); + $email_tpl, + 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" + . 'Content-type: text/plain; charset=UTF-8' . "\n" + . 'Content-transfer-encoding: 8bit' ); + break; } } |