Index: dayhour.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/dayhour.inc,v retrieving revision 1.17 diff -u -p -r1.17 dayhour.inc --- dayhour.inc 25 Nov 2007 21:08:58 -0000 1.17 +++ dayhour.inc 28 Sep 2009 20:13:58 -0000 @@ -125,6 +125,23 @@ function station_minute_from_day_hour($d } /** + * Convert a local timestamp into an integer specifying minutes since midnight + * on Sunday. + * + * @return + * Integer specifying the number of minutes. + * + * @see station_local_ts() + */ +function station_minute_from_local_ts($local_timestamp = NULL) { + if (!isset($local_timestamp)) { + $local_timestamp = station_local_ts(); + } + list($day, $hour, $minute) = explode(' ', date('w G i', $local_timestamp)); + return (($day * 24) + $hour) * 60 + $minute; +} + +/** * Day of the week from minutes. * * @param $minutes Index: schedule/station_schedule.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/schedule/station_schedule.module,v retrieving revision 1.75.2.2 diff -u -p -r1.75.2.2 station_schedule.module --- schedule/station_schedule.module 22 Apr 2009 19:06:35 -0000 1.75.2.2 +++ schedule/station_schedule.module 28 Sep 2009 20:13:58 -0000 @@ -917,8 +917,7 @@ function station_schedule_get_program_li */ function station_schedule_program_get_at($gmt_timestamp, $schedule_nid) { // Load the schedule item based on the time. - $ts = station_local_ts($gmt_timestamp); - $minute = station_minute_from_day_hour(date('w', $ts), date('G', $ts)); + $minute = station_minute_from_local_ts(station_local_ts($gmt_timestamp)); $schedule_item = db_fetch_object(db_query('SELECT * FROM {station_schedule_item} s WHERE s.schedule_nid = %d AND s.start <= %d AND s.finish > %d', $schedule_nid, $minute, $minute)); Index: schedule/views.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/schedule/Attic/views.inc,v retrieving revision 1.19 diff -u -p -r1.19 views.inc --- schedule/views.inc 25 Mar 2008 07:11:28 -0000 1.19 +++ schedule/views.inc 28 Sep 2009 20:13:59 -0000 @@ -218,8 +218,7 @@ function station_schedule_views_tables() * Substitute current time; this works with cached queries. */ function station_schedule_views_query_substitutions($view) { - $timestamp = station_local_ts(time()); - $minute = station_minute_from_day_hour(date('w', $timestamp), date('G', $timestamp)); + $minute = station_minute_from_local_ts(); return array('***CURRENT_STATION_MINUTE***' => $minute); }