Dear $username not expanded/replaced in text emails

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 6ca3f9fc2fa0b4e5eaf12e497892661934a3f2fc..8f11cabf44d7c360f20e1c357439f67177b2d9de 100644 (file)
--- 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 d7c15ff025bd4529f049441fae8d2af065e11998..776c0dcc2d501dbe1eaeff58fe059fe7783c96a1 100644 (file)
--- 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