Index: event.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/event/event.module,v retrieving revision 1.162 diff -u -r1.162 event.module --- event.module 1 Nov 2005 17:19:07 -0000 1.162 +++ event.module 1 Nov 2005 23:47:06 -0000 @@ -1370,24 +1370,26 @@ * * @ingroup event_support * @param $node The submitted node with form data. - * @param $prefix The prefix to validate and set (start and end). + * @param $prefix The prefix to validate and set (start or end). */ function event_validate_form_date(&$node, $prefix) { + // rather than concatinate in a bun + $fix = $prefix . '_'; // Re-calculate $node->event_start if we have all the parameters. - if (isset($node->{$prefix . 'year'}) && isset($node->{$prefix . 'month'}) && isset($node->{$prefix . 'day'}) && isset($node->{$prefix . 'hour'}) && isset($node->{$prefix . 'minute'})) { - $hour = $node->{$prefix . 'hour'}; + if (isset($node->{$fix . 'year'}) && isset($node->{$fix . 'month'}) && isset($node->{$fix . 'day'}) && isset($node->{$fix . 'hour'}) && isset($node->{$fix . 'minute'})) { + $hour = $node->{$fix . 'hour'}; if (variable_get('event_ampm', '0')) { - if (($node->{$prefix . 'ampm'} == 'pm') && ($hour != 12)) { + if (($node->{$fix . 'ampm'} == 'pm') && ($hour != 12)) { $hour += 12; } - elseif (($node->{$prefix . 'ampm'} == 'am') && ($hour == 12)) { + elseif (($node->{$fix . 'ampm'} == 'am') && ($hour == 12)) { $hour -= 12; } } // translate the input values to GMT and set the node property value - $offset = event_get_offset($node->timezone, gmmktime($hour, $node->{$prefix . 'minute'}, 0, $node->{$prefix . 'month'}, $node->{$prefix . 'day'}, $node->{$prefix . 'year'})); - $node->{'event_'.$prefix} = _event_mktime($hour, $node->{$prefix . 'minute'}, 0, $node->{$prefix . 'month'}, $node->{$prefix . 'day'}, $node->{$prefix . 'year'}, $offset); + $offset = event_get_offset($node->timezone, gmmktime($hour, $node->{$fix . 'minute'}, 0, $node->{$fix . 'month'}, $node->{$fix . 'day'}, $node->{$fix . 'year'})); + $node->{'event_' . $prefix} = _event_mktime($hour, $node->{$fix . 'minute'}, 0, $node->{$fix . 'month'}, $node->{$fix . 'day'}, $node->{$fix . 'year'}, $offset); } elseif (!$node->$prefix) { // Round to nearest hour: