diff -Naur -x episode modules.orig/tv/schedules.php modules/tv/schedules.php
old
|
new
|
|
36 | 36 | $schedule->profile = ''; |
37 | 37 | $schedule->recgroup = ''; |
38 | 38 | } |
39 | | // Add a blank channel, to suppress warnings |
40 | | if (!$schedule->channel) { |
41 | | $schedule->channel = Channel::find(null); |
| 39 | // Add a blank channel, to suppress warnings, or for "Any" channel schedules without "This Channel" filter |
| 40 | if (!$schedule->channel || ($schedule->type == rectype_daily || $schedule->type == rectype_always || $schedule->type == rectype_weekly || $schedule->type == rectype_findone) && !($schedule->filter & (1 << 10))) { |
| 41 | $schedule->channel =& Channel::find(null); |
42 | 42 | } |
43 | 43 | // Add this show |
44 | 44 | $the_schedules[] = &$schedule; |
diff -Naur -x episode modules.orig/tv/tmpl/default/schedules.php modules/tv/tmpl/default/schedules.php
old
|
new
|
|
95 | 95 | $urlstr = 'recordid='.$schedule->recordid; |
96 | 96 | |
97 | 97 | $css_class = ($schedule->type == rectype_dontrec ? 'deactivated' : 'scheduled'); |
98 | | // If this is an 'always on any channel' or 'find one' recording without the 'This Channel' filter, set the channel name to 'Any' |
99 | | if (($schedule->type == rectype_always || $schedule->type == rectype_findone) && !($schedule->filter & (1 << 10))) { |
| 98 | // 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' |
| 99 | if (($schedule->type == rectype_daily || $schedule->type == rectype_always || $schedule->type == rectype_weekly || $schedule->type == rectype_findone) && !($schedule->filter & (1 << 10))) { |
100 | 100 | $schedule->channel->name = '[ '.t('Any').' ]'; |
101 | 101 | $schedule->channel->channum = 0; |
102 | 102 | } |
diff -Naur -x episode modules.orig/tv/tmpl/lite/schedules.php modules/tv/tmpl/lite/schedules.php
old
|
new
|
|
53 | 53 | $urlstr = 'recordid='.$schedule->recordid; |
54 | 54 | |
55 | 55 | $css_class = ($schedule->type == rectype_dontrec ? 'deactivated' : 'scheduled'); |
56 | | // If this is an 'always on any channel' or 'find one' recording without the 'This Channel' filter, set the channel name to 'Any' |
57 | | if (($schedule->type == rectype_always || $schedule->type == rectype_findone) && !($schedule->filter & (1 << 10))) { |
| 56 | // 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' |
| 57 | if (($schedule->type == rectype_daily || $schedule->type == rectype_always || $schedule->type == rectype_weekly || $schedule->type == rectype_findone) && !($schedule->filter & (1 << 10))) { |
58 | 58 | $schedule->channel->name = '[ '.t('Any').' ]'; |
59 | 59 | $schedule->channel->channum = 0; |
60 | 60 | } |