drupal/booking
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
Nathan Coad
2017-06-27 12:48:55 +10:00
parent e589f6b0a5
commit 9fd05f98da
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
booking.emails.inc
View File

@@ -43,10 +43,14 @@ function _booking_registration_email($nid, $balance_payment, $manual = false) {
//apply a theme to the HTML body of the email //apply a theme to the HTML body of the email
$html_body = theme('booking_htmlmail_template', $html_body = theme('booking_htmlmail_template',
array('variables' => array( array(
'body' => _booking_registration_email_generate($node, $waiting_list, $balance_payment, $manual), 'module' => 'booking',
'key' => 'registration_mail',
'variables' => array(
'body' => _booking_registration_email_generate($node, $waiting_list, $balance_payment, $manual),
)
) )
)); );
watchdog('booking_debug', "<pre>HTML body themed\n@info</pre>", array('@info' => print_r($html_body, true))); watchdog('booking_debug', "<pre>HTML body themed\n@info</pre>", array('@info' => print_r($html_body, true)));
$params['body'] = $html_body; $params['body'] = $html_body;

2
booking.emails_admin.inc
View File

@@ -499,7 +499,7 @@ function _booking_email_get_preview_callback($form, $form_state) {
switch ($emailtype) { switch ($emailtype) {
case "registration": case "registration":
$text = variable_get('booking_email_bookedin_text'); $text = variable_get('booking_email_bookedin_text');
watchdog('booking_debug', "<pre>Email generation:\n@info</pre>", array('@info' => print_r( $text, true))); //watchdog('booking_debug', "<pre>Email generation:\n@info</pre>", array('@info' => print_r( $text, true)));
//use the html value if it is set, otherwise use the plaintext input which is just a string //use the html value if it is set, otherwise use the plaintext input which is just a string
$text = isset($text['format']) ? $text['value'] : $text; $text = isset($text['format']) ? $text['value'] : $text;
break; break;