Merge branch 'master' of gitlab.coadcorp.com:drupal/booking

booking.tokens.inc

@@ -273,6 +273,7 @@ $booking_registration_intro_text = variable_get('booking_registration_intro_text
 		'#type' => 'text_format',
 		'#format' => 'full_html',		
 	);	
+<<<<<<< HEAD
 	$form['travel']['booking_travelform_page_post_text'] = array(
 		'#title' => t('Text to use at the end of the travel form'),
 		'#type' => 'textarea',
@@ -290,6 +291,8 @@ $booking_registration_intro_text = variable_get('booking_registration_intro_text
 		'#format' => 'full_html',		
 	);	
 	
+=======
+>>>>>>> 7c4deaa50283ea16ea369ebf325d2eb2bec3d402
 	/*
 	$form['travel']['booking_travelform_page'] = array(
 		'#title' => t('Text to use at the start of the travel form for a non-married person.'),
@@ -303,15 +306,32 @@ $booking_registration_intro_text = variable_get('booking_registration_intro_text
 		'#description' => t(''),
 		'#default_value' => variable_get('booking_travelform_married_page', ''),	
 	);
+<<<<<<< HEAD
+=======
+	*/
+	$form['confirmation']['booking_travelform_page_post_text'] = array(
+		'#title' => t('Text to use at the end of the travel form'),
+		'#type' => 'textarea',
+		'#description' => t(''),
+		'#default_value' => isset(variable_get('booking_travelform_page_post_text')['value']) ? variable_get('booking_travelform_page_post_text')['value'] : $defaults,
+		'#type' => 'text_format',
+		'#format' => 'full_html',		
+	);	
+>>>>>>> 7c4deaa50283ea16ea369ebf325d2eb2bec3d402
 	$form['travel']['booking_travelform_completed_page'] = array(
 		'#title' => t('Text to use on the travel form if the form has already been submitted.'),
 		'#type' => 'textarea',
 		'#description' => t(''),
 		'#default_value' => variable_get('booking_travelform_completed_page', ''),	
 	);	
+<<<<<<< HEAD
 	*/
 	
 	//other pages like paypal landing page
+=======
+	
+	/*People reporting pages*/
+>>>>>>> 7c4deaa50283ea16ea369ebf325d2eb2bec3d402
 	$form['otherpages'] = array(
 		'#type' => 'fieldset',
 		'#title' => 'Miscellaneous pages',