Index: openacs-4/packages/calendar/www/view-month-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-month-display.tcl,v diff -u -r1.22.2.3 -r1.22.2.4 --- openacs-4/packages/calendar/www/view-month-display.tcl 23 May 2008 21:19:00 -0000 1.22.2.3 +++ openacs-4/packages/calendar/www/view-month-display.tcl 29 May 2008 14:08:31 -0000 1.22.2.4 @@ -92,10 +92,11 @@ # Get the beginning and end of the month in the system timezone set first_date_of_month [dt_julian_to_ansi $first_julian_date_of_month] -set first_date_of_month_system [lc_time_conn_to_system "$first_date_of_month 00:00:00"] set last_date_in_month [dt_julian_to_ansi $last_julian_date_in_month] -set last_date_in_month_system [lc_time_conn_to_system "$last_date_in_month 23:59:59"] +set first_date_of_month_system "$first_date_of_month 00:00:00" +set last_date_in_month_system "$last_date_in_month 23:59:59" + set day_number $first_day set today_ansi_list [dt_ansi_to_list $today_date] @@ -172,24 +173,23 @@ set interval_limitation_clause [db_map dbqd.calendar.www.views.month_interval_limitation] db_foreach dbqd.calendar.www.views.select_items {} { - # Convert from system timezone to user timezone - set ansi_start_date [lc_time_system_to_conn $ansi_start_date] - set ansi_end_date [lc_time_system_to_conn $ansi_end_date] + if { $ansi_start_date eq $ansi_end_date } { + set time_p 0 + } else { + set time_p 1 + # Convert from system timezone to user timezone + set ansi_start_date [lc_time_system_to_conn $ansi_start_date] + set ansi_end_date [lc_time_system_to_conn $ansi_end_date] + } + # Localize set pretty_weekday [lc_time_fmt $ansi_start_date "%A"] set pretty_start_date [lc_time_fmt $ansi_start_date "%x"] set pretty_end_date [lc_time_fmt $ansi_end_date "%x"] set pretty_start_time [lc_time_fmt $ansi_start_date "%X"] set pretty_end_time [lc_time_fmt $ansi_end_date "%X"] - if { [string equal $ansi_start_date $ansi_end_date] && \ - [string equal [lc_time_fmt $ansi_start_date "%T"] "00:00:00"] } { - set time_p 0 - } else { - set time_p 1 - } - set julian_start_date [dt_ansi_to_julian_single_arg $ansi_start_date] if {!$exporting_p && $current_day < $julian_start_date} {