Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Suppress more PHP 5.4 warnings

Closes #10504
  • Loading branch information...
commit 7232c54eec2fa1416ef8c0b3fbdad642aaf26b55 1 parent 0427785
@ex-nerd ex-nerd authored
Showing with 5 additions and 1 deletion.
  1. +1 −1  includes/sorting.php
  2. +4 −0 modules/tv/schedules.php
View
2  includes/sorting.php
@@ -119,7 +119,7 @@ function sort_programs(&$programs, $session) {
function by_user_choice(&$a, &$b) {
foreach ($GLOBALS['user_sort_choice'] as $sort) {
$function = 'by_'.$sort['field'];
- $response = $function(&$a, &$b);
+ $response = $function($a, $b);
// Identical response, go on to the next sort choice
if (!$response)
continue;
View
4 modules/tv/schedules.php
@@ -36,6 +36,10 @@
$schedule->profile = '';
$schedule->recgroup = '';
}
+ // Add a blank channel, to suppress warnings
+ if (!$schedule->channel) {
+ $schedule->channel = Channel::find(null);
+ }
// Add this show
$the_schedules[] = &$schedule;
}
Please sign in to comment.
Something went wrong with that request. Please try again.