summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Grossenbacher2010-07-20 18:45:35 (GMT)
committer Sascha Grossenbacher2010-07-20 18:45:35 (GMT)
commit47d0e5da1a06c865545fc81c52e95e68f6ebfe76 (patch)
tree8818669172aa65082f2572efdedb30411a646aa9
parent6391fb81b3bba63c9fb50cb384e72bc7dd5ca4fa (diff)
#857726 by Berdir | BenK: Fixed sending message with pm_email_notify() enabled causes fatal error.
-rw-r--r--pm_email_notify/pm_email_notify.module5
1 files changed, 2 insertions, 3 deletions
diff --git a/pm_email_notify/pm_email_notify.module b/pm_email_notify/pm_email_notify.module
index 00c04f5..8d9efb6 100644
--- a/pm_email_notify/pm_email_notify.module
+++ b/pm_email_notify/pm_email_notify.module
@@ -65,12 +65,11 @@ function pm_email_notify_privatemsg_message_insert($message) {
*/
function pm_email_notify_mail($key, &$message, $params) {
$language = $message['language'];
- $variables = user_mail_tokens($params['recipient'], $language);
- $variables = array_merge($variables, _pm_email_notify_token($params['recipient'], $params['message']));
+ $variables = _pm_email_notify_token($params['recipient'], $params['message']);
switch ($key) {
case 'notice':
$message['subject'] = trim(t(variable_get('pm_email_notify_subject', 'New private message at !site.'), $variables, array('langcode' => $language->language)));
- $message['body'] = trim(t(variable_get('pm_email_notify_body', _pm_email_notify_default_body()), $variables, array('langcode' => $language->language)));
+ $message['body'] = array(trim(t(variable_get('pm_email_notify_body', _pm_email_notify_default_body()), $variables, array('langcode' => $language->language))));
break;
}
}