From c67778b65237cf835ee585e8a0cc6921f15fd263 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Tue, 31 May 2016 19:23:45 +1000 Subject: [PATCH] logic fixes --- booking.travel.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/booking.travel.inc b/booking.travel.inc index 26d2b97..cc76f77 100644 --- a/booking.travel.inc +++ b/booking.travel.inc @@ -299,6 +299,7 @@ function travel_form($node, &$form_state, $inserting = FALSE, $nid = 0) $form['requirements']['booking_medical_conditions'] = array( '#type' => 'textfield', '#title' => t('Please describe any medical condition we need to know about.'), + '#description' => t('This field contains information you entered when you registered.'), '#maxlength' => 180, '#required' => FALSE, '#default_value' => !empty($data->booking_medical_conditions) ? $data->booking_medical_conditions : $booking_medical_conditions @@ -306,7 +307,7 @@ function travel_form($node, &$form_state, $inserting = FALSE, $nid = 0) //only show the room mate field if we're allowed to if (variable_get('booking_enable_roommate', 0) == 1 || $inserting == FALSE) { //married people won't need to select a room mate - if ((variable_get('booking_enable_combined_pricing', 0) == 1) && $person->booking_partner_id == 0) { + if ($person->booking_partner_id == 0) { $form['requirements']['booking_room_mate1'] = array( '#type' => 'textfield', '#title' => t('I would like to share a room with'),