aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-06-14 20:49:25 -0700
committerFriendika <info@friendika.com>2011-06-14 20:49:25 -0700
commitca848234375867240ba6cc6d4b43599e770a54e8 (patch)
tree6df4a7c83196c89c28528c899772f7e19d4f84f3 /mod
parentfcdebc23248bb3010133aabdfbf4420e1aa4ad27 (diff)
downloadvolse-hubzilla-ca848234375867240ba6cc6d4b43599e770a54e8.tar.gz
volse-hubzilla-ca848234375867240ba6cc6d4b43599e770a54e8.tar.bz2
volse-hubzilla-ca848234375867240ba6cc6d4b43599e770a54e8.zip
Dear $username not expanded/replaced in text emails
Diffstat (limited to 'mod')
-rw-r--r--mod/dfrn_notify.php6
-rw-r--r--mod/item.php4
2 files changed, 10 insertions, 0 deletions
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 6ca3f9fc2..8f11cabf4 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -217,6 +217,7 @@ function dfrn_notify_post(&$a) {
// load the template for private message notifications
$tpl = get_intltext_template('mail_received_html_body_eml.tpl');
$email_html_body_tpl = replace_macros($tpl,array(
+ '$username' => $importer['username'],
'$siteName' => $a->config['sitename'], // name of this site
'$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $importer['thumb'], // thumbnail url for sender icon
@@ -232,6 +233,7 @@ function dfrn_notify_post(&$a) {
// load the template for private message notifications
$tpl = get_intltext_template('mail_received_text_body_eml.tpl');
$email_text_body_tpl = replace_macros($tpl,array(
+ '$username' => $importer['username'],
'$siteName' => $a->config['sitename'], // name of this site
'$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $importer['thumb'], // thumbnail url for sender icon
@@ -416,6 +418,7 @@ function dfrn_notify_post(&$a) {
// load the template for private message notifications
$tpl = get_intltext_template('cmnt_received_html_body_eml.tpl');
$email_html_body_tpl = replace_macros($tpl,array(
+ '$username' => $importer['username'],
'$sitename' => $a->config['sitename'], // name of this site
'$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $datarray['author-avatar'], // thumbnail url for sender icon
@@ -429,6 +432,7 @@ function dfrn_notify_post(&$a) {
// load the template for private message notifications
$tpl = get_intltext_template('cmnt_received_text_body_eml.tpl');
$email_text_body_tpl = replace_macros($tpl,array(
+ '$username' => $importer['username'],
'$sitename' => $a->config['sitename'], // name of this site
'$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $datarray['author-avatar'], // thumbnail url for sender icon
@@ -545,6 +549,7 @@ function dfrn_notify_post(&$a) {
// load the template for private message notifications
$tpl = get_intltext_template('cmnt_received_html_body_eml.tpl');
$email_html_body_tpl = replace_macros($tpl,array(
+ '$username' => $importer['username'],
'$sitename' => $a->config['sitename'], // name of this site
'$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $datarray['author-avatar'], // thumbnail url for sender icon
@@ -557,6 +562,7 @@ function dfrn_notify_post(&$a) {
// load the template for private message notifications
$tpl = get_intltext_template('cmnt_received_text_body_eml.tpl');
$email_text_body_tpl = replace_macros($tpl,array(
+ '$username' => $importer['username'],
'$sitename' => $a->config['sitename'], // name of this site
'$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $datarray['author-avatar'], // thumbnail url for sender icon
diff --git a/mod/item.php b/mod/item.php
index d7c15ff02..776c0dcc2 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -544,6 +544,7 @@ function item_post(&$a) {
// load the template for private message notifications
$tpl = get_intltext_template('cmnt_received_html_body_eml.tpl');
$email_html_body_tpl = replace_macros($tpl,array(
+ '$username' => $user['username'],
'$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
@@ -557,6 +558,7 @@ function item_post(&$a) {
// load the template for private message notifications
$tpl = get_intltext_template('cmnt_received_text_body_eml.tpl');
$email_text_body_tpl = replace_macros($tpl,array(
+ '$username' => $user['username'],
'$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
@@ -610,6 +612,7 @@ function item_post(&$a) {
// load the template for private message notifications
$tpl = load_view_file('view/wall_received_html_body_eml.tpl');
$email_html_body_tpl = replace_macros($tpl,array(
+ '$username' => $user['username'],
'$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
@@ -622,6 +625,7 @@ function item_post(&$a) {
// load the template for private message notifications
$tpl = load_view_file('view/wall_received_text_body_eml.tpl');
$email_text_body_tpl = replace_macros($tpl,array(
+ '$username' => $user['username'],
'$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