From 8ddbce54c16b9728133cd869385ab527a9cea162 Mon Sep 17 00:00:00 2001
From: Nathan Coad <nathan@thecoads.com>
Date: Sat, 4 Jun 2016 10:23:23 +1000
Subject: [PATCH] possible fixes

---
 booking.travel.inc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/booking.travel.inc b/booking.travel.inc
index a905dd2..2f21915 100644
--- a/booking.travel.inc
+++ b/booking.travel.inc
@@ -110,17 +110,18 @@ function travel_form($node, &$form_state, $inserting = FALSE, $node = NULL, $tok
   //there's already info in $node so use that
   if (!empty($node)) {
     $data = $node;
+    watchdog('booking_debug', "<pre>Travel form not-empty node:\n@info</pre>", array('@info' => print_r( $form_state, true)));
   }
   //otherwise rely on the form state from the previous submission
   else {
-    $data = $form_state['input'];
-    watchdog('booking_debug', "<pre>Travel form:\n@info</pre>", array('@info' => print_r( $form_state, true)));
+    $data = $form_state['node'];
+    watchdog('booking_debug', "<pre>Travel form empty node:\n@info</pre>", array('@info' => print_r( $data, true)));
   }
   
   //get info about this person from the relevant node id
   $person = db_query("SELECT booking_dietary, booking_medical_conditions, booking_bf_gf_nid, booking_partner_id, booking_room_mate1 " . 
                     "FROM {booking_person} " . "WHERE nid = :nid ", 
-                    array(':nid' => isset($node->nid) ? $node->nid : $data->booking_person_nid))->fetchObject();
+                    array(':nid' => $data->nid))->fetchObject();
   
   if ($person) {
     $booking_dietary = $person->booking_dietary;
@@ -134,7 +135,7 @@ function travel_form($node, &$form_state, $inserting = FALSE, $node = NULL, $tok
   //store the node id
   $form['personid'] = array(
     '#type' => 'hidden',
-    '#value' => $node->nid,
+    '#value' => $data->nid,
   );
   
   $form['travel'] = array(