diff --git a/booking.travel.inc b/booking.travel.inc index d22b17d..4a989b9 100644 --- a/booking.travel.inc +++ b/booking.travel.inc @@ -68,7 +68,7 @@ function booking_travel_page() ); //actual form $return_array[] = array( - 'form' => drupal_get_form('travel_form', true, $tokens) + 'form' => drupal_get_form('travel_form', $node, true, $tokens) ); //text after form /* @@ -92,7 +92,7 @@ function booking_travel_page() } //function travel_form($node, &$form_state, $inserting = FALSE, $node = NULL, $tokens = NULL) -function travel_form($node, &$form_state, $inserting = FALSE, $tokens = NULL) +function travel_form($node, &$form_state, $db_node = NULL, $inserting = FALSE, $tokens = NULL) { global $event; date_default_timezone_set(date_default_timezone(FALSE)); @@ -109,14 +109,14 @@ function travel_form($node, &$form_state, $inserting = FALSE, $tokens = NULL) ); //there's already info in $node so use that - if (!empty($node)) { - $data = $node; - watchdog('booking_debug', "
Travel form not-empty node:\n@info", array('@info' => print_r( $node, true))); + if (!empty($db_node)) { + $data = $db_node; + watchdog('booking_debug', "
Travel form not-empty node:\n@info", array('@info' => print_r( $data, true))); } //otherwise rely on the form state from the previous submission else { $data = $form_state['node']; - watchdog('booking_debug', "
Travel form empty node:\n@info", array('@info' => print_r( $form_state, true))); + watchdog('booking_debug', "
Travel form empty node:\n@info", array('@info' => print_r( $data, true))); } //get info about this person from the relevant node id