diff options
| author | Friendika <info@friendika.com> | 2011-05-25 18:15:49 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-05-25 18:15:49 -0700 |
| commit | 3710a6fd070c7736e68b2f88ddd2c159b596da81 (patch) | |
| tree | 903bab596c646c3b048c15c139294bffe2ecf0e0 /mod/item.php | |
| parent | ce25042a84d4e82c1352e101d2a57b4a7d60923a (diff) | |
| download | volse-hubzilla-3710a6fd070c7736e68b2f88ddd2c159b596da81.tar.gz volse-hubzilla-3710a6fd070c7736e68b2f88ddd2c159b596da81.tar.bz2 volse-hubzilla-3710a6fd070c7736e68b2f88ddd2c159b596da81.zip | |
sort out a couple of email notify issues
Diffstat (limited to 'mod/item.php')
| -rw-r--r-- | mod/item.php | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/mod/item.php b/mod/item.php index c02bb2c48..82f33eaeb 100644 --- a/mod/item.php +++ b/mod/item.php @@ -533,10 +533,10 @@ function item_post(&$a) { '$siteurl' => $a->get_baseurl(), // descriptive url of this site '$thumb' => $author['thumb'], // thumbnail url for sender icon '$email' => $importer['email'], // email address to send to - '$url' => $author['url'], // full url for the site - '$from' => $from, // name of the person sending the message + '$url' => $author['url'], // full url for the site + '$from' => $from, // name of the person sending the message '$body' => $msg['htmlversion'], // html version of the message - '$display' => $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id, + '$display' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id, )); // load the template for private message notifications @@ -546,10 +546,10 @@ function item_post(&$a) { '$siteurl' => $a->get_baseurl(), // descriptive url of this site '$thumb' => $author['thumb'], // thumbnail url for sender icon '$email' => $importer['email'], // email address to send to - '$url' => $author['url'], // full url for the site - '$from' => $from, // name of the person sending the message + '$url' => $author['url'], // profile url for the author + '$from' => $from, // name of the person sending the message '$body' => $msg['textversion'], // text version of the message - '$display' => $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id, + '$display' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id, )); // use the EmailNotification library to send the message @@ -559,7 +559,7 @@ function item_post(&$a) { t("Administrator@") . $a->get_hostname(), t("noreply") . '@' . $a->get_hostname(), $user['email'], - $from . t(" commented on an item at ") . $a->config['sitename'], + sprintf( t('%s commented on an item at %s'), $from , $a->config['sitename']), $email_html_body_tpl, $email_text_body_tpl ); @@ -598,10 +598,10 @@ function item_post(&$a) { '$sitename' => $a->config['sitename'], // name of this site '$siteurl' => $a->get_baseurl(), // descriptive url of this site '$thumb' => $author['thumb'], // thumbnail url for sender icon - '$url' => $author['url'], // full url for the site - '$from' => $from, // name of the person sending the message + '$url' => $author['url'], // full url for the site + '$from' => $from, // name of the person sending the message '$body' => $msg['htmlversion'], // html version of the message - '$display' => $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id, + '$display' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id, )); // load the template for private message notifications @@ -610,10 +610,10 @@ function item_post(&$a) { '$sitename' => $a->config['sitename'], // name of this site '$siteurl' => $a->get_baseurl(), // descriptive url of this site '$thumb' => $author['thumb'], // thumbnail url for sender icon - '$url' => $author['url'], // full url for the site - '$from' => $from, // name of the person sending the message + '$url' => $author['url'], // full url for the site + '$from' => $from, // name of the person sending the message '$body' => $msg['textversion'], // text version of the message - '$display' => $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id, + '$display' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id, )); // use the EmailNotification library to send the message @@ -623,7 +623,7 @@ function item_post(&$a) { t("Administrator@") . $a->get_hostname(), t("noreply") . '@' . $a->get_hostname(), $user['email'], - $from . t(" commented on an item at ") . $a->config['sitename'], + sprintf( t('%s posted to your profile wall at %s') , $from , $a->config['sitename']), $email_html_body_tpl, $email_text_body_tpl ); |