819c819
<   $fields = content_fields();
---
>   $content_types = content_types();
823,825c823,828
<   foreach ($fields as $field_name => $field) {
<     if ($field['type'] == 'date' || $field['type'] == 'datestamp') {
<       $type_options[$field['type_name']] = $node_types[$field['type_name']];
---
>   foreach ($content_types as $content_name => $content) {
>     $fields = $content['fields'];
>     foreach ($fields as $field_name => $field) {
>       if ($field['type'] == 'date' || $field['type'] == 'datestamp') {
>           $type_options[$content_name] = $node_types[$content_name];
>       }
865c868
<   $fields = content_fields();
---
>   $content_types = content_types();
873,885c876,891
<   foreach ($fields as $field_name => $field) {
<     if ($field['type_name'] == $type) {
<       if ($field['type'] == 'date' || $field['type'] == 'datestamp') {
<         $date_options[$field_name] = $field['widget']['label'];
<       }
<       if ($field['type'] == 'text') {
<         $description_options[$field_name] = $field['widget']['label'];
<         $location_options[$field_name] = $field['widget']['label'];
<         $uid_options[$field_name] = $field['widget']['label'];
<         $url_options[$field_name] = $field['widget']['label'];
<       }
<       if ($field['type'] == 'link') {
<         $url_options[$field_name] = $field['widget']['label'];
---
>   foreach ($content_types as $content_name => $content) {
>     $fields = $content['fields'];
>     foreach ($fields as $field_name => $field) {
>       if ($field['type_name'] == $type) {
>         if ($field['type'] == 'date' || $field['type'] == 'datestamp') {
>           $date_options[$field_name] = $field['widget']['label'];
>         }
>         if ($field['type'] == 'text') {
>           $description_options[$field_name] = $field['widget']['label'];
>           $location_options[$field_name] = $field['widget']['label'];
>           $uid_options[$field_name] = $field['widget']['label'];
>           $url_options[$field_name] = $field['widget']['label'];
>         }
>         if ($field['type'] == 'link') {
>           $url_options[$field_name] = $field['widget']['label'];
>         }
1066d1071
< 
1147c1152
<   $event_tz_handling = variable_get('event_timezone_display', 'event');
---
>   $event_tz_handling = 'site'; //variable_get('event_timezone_display', 'event');
1238,1239c1243,1244
<       date_timezone_set($start, timezone_open('UTC'));
<       date_timezone_set($end, timezone_open('UTC'));
---
> //      date_timezone_set($start, timezone_open('UTC'));
> //      date_timezone_set($end, timezone_open('UTC'));
1243d1247
<