? station_347665.patch
Index: station.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/station/station.module,v
retrieving revision 1.47
diff -u -p -r1.47 station.module
--- station.module	26 May 2009 17:25:45 -0000	1.47
+++ station.module	26 May 2009 17:36:12 -0000
@@ -223,8 +223,10 @@ function station_get_program_at($timesta
 
   // Use the local schedule if one is available.
   if (module_exists('station_schedule')) {
-    if ($program = station_schedule_program_get_at($timestamp, $schedule_nid) && !empty($program->nid)) {
-      return $program;
+    if ($program = station_schedule_program_get_at($timestamp, $schedule_nid)) {
+      if (!empty($program->nid)) {
+        return $program;
+      } 
     }
   }
   else {
Index: schedule/station_schedule.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/station/schedule/station_schedule.module,v
retrieving revision 1.85
diff -u -p -r1.85 station_schedule.module
--- schedule/station_schedule.module	19 Apr 2009 21:34:12 -0000	1.85
+++ schedule/station_schedule.module	26 May 2009 17:36:13 -0000
@@ -788,12 +788,17 @@ function station_schedule_get_list() {
   $result = db_query("SELECT n.nid, n.title, ss.increment, ss.streams, ss.unscheduled_message FROM {node} n INNER JOIN {station_schedule} ss ON n.nid = ss.nid WHERE n.type = 'station_schedule'");
   while ($schedule = db_fetch_array($result)) {
     $schedule['base_url'] = $base_url;
-    if (is_array($schedule['streams'])) {
-      foreach ($schedule['streams'] as $key => &$stream) {
+    if (isset($schedule['streams']) && $streams = unserialize($schedule['streams'])) {
+      $schedule['streams'] = array();
+      foreach ($streams as $key => $stream) {
         // Add in the M3U URL.
         $stream['m3u_url'] = url('node/'. $schedule['nid'] .'/'. $key .'.m3u', array('absolute' => TRUE));
+        $schedule['streams'][$key] = $stream;
       }
     }
+    else {
+      $schedule['streams'] = array();
+    }
     $schedules[$schedule['nid']] = $schedule;
   }