Ticket #12276: mythweb_schedules_any_fix.patch

tv/schedules.php

@@ -36 +36 @@
             $schedule->profile  = '';
             $schedule->recgroup = '';
         }
-    // Add a blank channel, to suppress warnings
-        if (!$schedule->channel) {
-            $schedule->channel = Channel::find(null);
+    // Add a blank channel, to suppress warnings, or for "Any" channel schedules without "This Channel" filter
+        if (!$schedule->channel || ($schedule->type == rectype_daily || $schedule->type == rectype_always || $schedule->type == rectype_weekly || $schedule->type == rectype_findone) && !($schedule->filter & (1 << 10))) {
+            $schedule->channel =& Channel::find(null);
         }
     // Add this show
         $the_schedules[] = &$schedule;

tv/tmpl/default/schedules.php

@@ -95 +95 @@
             $urlstr = 'recordid='.$schedule->recordid;
 
             $css_class = ($schedule->type == rectype_dontrec ? 'deactivated' : 'scheduled');
-        // If this is an 'always on any channel' or 'find one' recording without the 'This Channel' filter, set the channel name to 'Any'
-            if (($schedule->type == rectype_always || $schedule->type == rectype_findone) && !($schedule->filter & (1 << 10))) {
+        // If this is a 'daily' or 'always on any channel' or 'weekly' or 'find one' recording without the 'This Channel' filter, set the channel name to 'Any'
+            if (($schedule->type == rectype_daily || $schedule->type == rectype_always || $schedule->type == rectype_weekly || $schedule->type == rectype_findone) && !($schedule->filter & (1 << 10))) {
                 $schedule->channel->name = '[ '.t('Any').' ]';
                 $schedule->channel->channum = 0;
             }

tv/tmpl/lite/schedules.php

@@ -53 +53 @@
             $urlstr = 'recordid='.$schedule->recordid;
 
             $css_class = ($schedule->type == rectype_dontrec ? 'deactivated' : 'scheduled');
-        // If this is an 'always on any channel' or 'find one' recording without the 'This Channel' filter, set the channel name to 'Any'
-            if (($schedule->type == rectype_always || $schedule->type == rectype_findone) && !($schedule->filter & (1 << 10))) {
+        // If this is a 'daily', 'always on any channel', 'weekly' or 'find one' recording without the 'This Channel' filter, set the channel name to 'Any'
+            if (($schedule->type == rectype_daily || $schedule->type == rectype_always || $schedule->type == rectype_weekly || $schedule->type == rectype_findone) && !($schedule->filter & (1 << 10))) {
                 $schedule->channel->name = '[ '.t('Any').' ]';
                 $schedule->channel->channum = 0;
             }