diff --git a/booking.emails.inc b/booking.emails.inc index dc694bc..b42da3f 100644 --- a/booking.emails.inc +++ b/booking.emails.inc @@ -17,6 +17,7 @@ function _booking_registration_email($nid, $balance_payment, $manual = false) { //load the node matching this id $node = node_load($nid); + $tokens = booking_define_personspecific_tokens($node); watchdog('booking', 'Sending registration email to !first !last', array('!first' => $node->booking_firstname, '!last' => $node->booking_lastname)); @@ -51,7 +52,7 @@ function _booking_registration_email($nid, $balance_payment, $manual = false) { array( 'module' => 'booking', 'key' => 'registration_mail', - 'body' => _booking_registration_email_generate($node, $waiting_list, $balance_payment, $manual), + 'body' => _booking_registration_email_generate($node, $tokens, $waiting_list, $balance_payment, $manual), 'subject' => $subject, 'footer' => $message_footer, )); @@ -59,7 +60,7 @@ function _booking_registration_email($nid, $balance_payment, $manual = false) { $params['body'] = $html_body; } else { - $body = _booking_registration_email_generate($node, $waiting_list, $balance_payment, $manual); + $body = _booking_registration_email_generate($node, $tokens, $waiting_list, $balance_payment, $manual); $params['body'] = $body; } @@ -159,9 +160,9 @@ function _booking_regn_notifyonly_email($node, $balance_payment) { * @param $waiting_list - whether this registration is on on the waiting list * @return array containing email text */ - function _booking_registration_email_generate($node, $waiting_list, $balance_payment, $manual) { + function _booking_registration_email_generate($node, $tokens, $waiting_list, $balance_payment, $manual) { global $event; - $tokens = booking_define_personspecific_tokens($node); + //$tokens = booking_define_personspecific_tokens($node); $body = ""; if ($balance_payment == True) { diff --git a/theme/mimemail-message-registration_mail.tpl.php b/theme/mimemail-message-registration_mail.tpl.php index b16a138..ff8a5e1 100644 --- a/theme/mimemail-message-registration_mail.tpl.php +++ b/theme/mimemail-message-registration_mail.tpl.php @@ -296,14 +296,7 @@ a[x-apple-data-detectors=true] {
-
- - -
+