Suppress more PHP 5.4 warnings

Closes #10504
MythTV · Jun 14, 2012 · 7232c54 · 7232c54
1 parent 0427785
commit 7232c54
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/includes/sorting.php b/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;

diff --git a/modules/tv/schedules.php b/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;
     }