From 87b53bbc242c3990a45f5a6ab3ab6806939eb341 Mon Sep 17 00:00:00 2001
From: Nathan Coad <nathan@nath15mbpr.local>
Date: Mon, 15 Jan 2018 23:27:36 +1100
Subject: [PATCH] bugfix for email preview

---
 booking.emails_admin.inc | 5 ++++-
 booking.tokens.inc       | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/booking.emails_admin.inc b/booking.emails_admin.inc
index eb8d10c..bdcb6f2 100644
--- a/booking.emails_admin.inc
+++ b/booking.emails_admin.inc
@@ -652,7 +652,10 @@ function _booking_email_get_preview_callback($form, $form_state) {
     case "balance":
       $text = variable_get('booking_email_paymentoutstanding_text');
       if (variable_get('booking_enable_combined_pricing', 0) == 1) {
-        $text .= "\n</pre><h3>If married</h3>\n<pre>" . variable_get('booking_email_paymentoutstanding_married_text');
+        $text .= "\n</pre><h3>If married</h3>\n<pre>";
+        $married_text = variable_get('booking_email_paymentoutstanding_married_text');
+        // perform the checking of HTML value now since we're pre-pending text to it
+        $text .= isset($married_text['format']) ? $married_text['value'] : $married_text;
       }         
       break;
     case "complete":
diff --git a/booking.tokens.inc b/booking.tokens.inc
index 191b06a..9edd4c3 100644
--- a/booking.tokens.inc
+++ b/booking.tokens.inc
@@ -624,8 +624,8 @@ function booking_define_personspecific_tokens($node)
 	if (variable_get('booking_enable_html_mail', 0) == 1) {
 		$balance_link = url('balance/' . $tempid, array('absolute' => TRUE));
 		$confirm_link = url('confirm/' . $tempid, array('absolute' => TRUE));
-		$tokens['balance-payment-link'] = "<a href=\"$balance_link\">$balance_link</a";
-		$tokens['confirm-payment-link'] = "<a href=\"$confirm_link\">$confirm_link</a";
+		$tokens['balance-payment-link'] = "<a href=\"$balance_link\">$balance_link</a>";
+		$tokens['confirm-payment-link'] = "<a href=\"$confirm_link\">$confirm_link</a>";
 	} 
 	else {
 		$tokens['balance-payment-link'] = url('balance/' . $tempid, array('absolute' => TRUE));
@@ -656,7 +656,7 @@ function booking_define_personspecific_tokens($node)
 		// convert the URL into a href if html emails are enabled
 		if (variable_get('booking_enable_html_mail', 0) == 1) {
 			$travel_link = url('travel/' . $tempid, array('absolute' => TRUE));
-			$tokens['travel-link'] = "<a href=\"$travel_link\">$travel_link</a";
+			$tokens['travel-link'] = "<a href=\"$travel_link\">$travel_link</a>";
 		}
 		else {
 			$tokens['travel-link'] = url('travel/' . $tempid, array('absolute' => TRUE));