Index: openacs-4/packages/calendar/tcl/cal-item-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/cal-item-procs.tcl,v diff -u -r1.18.2.2 -r1.18.2.3 --- openacs-4/packages/calendar/tcl/cal-item-procs.tcl 21 Jun 2004 17:00:30 -0000 1.18.2.2 +++ openacs-4/packages/calendar/tcl/cal-item-procs.tcl 30 Jun 2004 16:10:57 -0000 1.18.2.3 @@ -76,7 +76,7 @@ ad_proc -public calendar::item::get { {-cal_item_id:required} {-array:required} - {-normalize_system_time 1} + {-normalize_time_to_utc 0} } { Get the data for a calendar item @@ -90,12 +90,12 @@ } db_1row $query_name {} -column_array row - if {$normalize_system_time} { + if {$normalize_time_to_utc} { + set row(start_date_ansi) [lc_time_local_to_utc $row(start_date_ansi)] + set row(end_date_ansi) [lc_time_local_to_utc $row(end_date_ansi)] + } else { set row(start_date_ansi) [lc_time_system_to_conn $row(start_date_ansi)] set row(end_date_ansi) [lc_time_system_to_conn $row(end_date_ansi)] - } else { - set row(start_date_ansi) [lc_time_conn_to_system $row(start_date_ansi)] - set row(end_date_ansi) [lc_time_conn_to_system $row(end_date_ansi)] } if { $row(start_date_ansi) == $row(end_date_ansi) && [string equal [lc_time_fmt $row(start_date_ansi) "%T"] "00:00:00"]} { Index: openacs-4/packages/calendar/tcl/calendar-outlook-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-outlook-procs.tcl,v diff -u -r1.13.2.1 -r1.13.2.2 --- openacs-4/packages/calendar/tcl/calendar-outlook-procs.tcl 21 Jun 2004 16:59:36 -0000 1.13.2.1 +++ openacs-4/packages/calendar/tcl/calendar-outlook-procs.tcl 30 Jun 2004 16:10:57 -0000 1.13.2.2 @@ -61,7 +61,7 @@ The client timezone helps to make things right. It is the number offset from GMT. } { - calendar::item::get -cal_item_id $cal_item_id -array cal_item -normalize_system_time 1 + calendar::item::get -cal_item_id $cal_item_id -array cal_item -normalize_time_to_utc 1 # If necessary, select recurrence information # Here we have some fields