diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-18 18:07:37 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-18 18:07:37 +0100 |
| commit | 878bdeccfd66b7b8229fd761c23ba13bc51c7454 (patch) | |
| tree | 6b881c4f71389ef6aa49776e8b99ac65f30f4ec2 /mod/dfrn_notify.php | |
| parent | f4f5095e19badcc85453182b86bff97f57228257 (diff) | |
| parent | 9838245c6c9b2e311650b53a1c3aa1ef778ef935 (diff) | |
| download | volse-hubzilla-878bdeccfd66b7b8229fd761c23ba13bc51c7454.tar.gz volse-hubzilla-878bdeccfd66b7b8229fd761c23ba13bc51c7454.tar.bz2 volse-hubzilla-878bdeccfd66b7b8229fd761c23ba13bc51c7454.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'mod/dfrn_notify.php')
| -rw-r--r-- | mod/dfrn_notify.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index f447b5453..2cc5a62f3 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -385,7 +385,7 @@ function dfrn_notify_post(&$a) { '$body' => html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8') )); - $res = mail($importer['email'], $from . t(' commented on an item at ') . $a->config['sitename'], + $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() ); } } @@ -471,9 +471,8 @@ function dfrn_notify_post(&$a) { '$body' => html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8') )); - $res = mail($importer['email'], $from . t(" commented on an item at ") - . $a->config['sitename'], - $email_tpl,t("From: Administrator@") . $a->get_hostname() ); + $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() ); break; } } |