Ticket #1232: mythweb.recorded.diff

includes/programs.php

@@ -379 +379 @@
         // No channel data?  Load it
             global $Channels;
             if (!is_array($Channels) || !count($Channels))
-                load_all_channels($this->chanid);
+                load_all_channels();
         // Now we really should scan the $Channel array and add a link to this program's channel
             foreach (array_keys($Channels) as $key) {
                 if ($Channels[$key]->chanid == $this->chanid) {

includes/channels.php

@@ -31 +31 @@
         else
             $sql = 'SELECT * FROM channel WHERE';
         $sql .= ' channel.visible=1';
-    // Group and sort
-        $sql .= ' GROUP BY channel.channum ORDER BY '
+    // Sort
+        $sql .= ' ORDER BY '
                 .(sortby_channum ? '' : 'channel.callsign, ')
                 .'(channel.channum + 0), channel.chanid';
     // Query

includes/recordings.php

@@ -123 +123 @@
         // No channel data?  Load it
             global $Channels;
             if (!is_array($Channels) || !count($Channels))
-                load_all_channels($this->chanid);
+                load_all_channels();
         // Now we really should scan the $Channel array and add a link to this recording's channel
             foreach (array_keys($Channels) as $key) {
                 if ($Channels[$key]->chanid == $this->chanid) {

modules/tv/recorded.php

@@ -56 +56 @@
 // Load the sorting routines
     require_once "includes/sorting.php";
 
+// Load all channels
+    load_all_channels();
+
 // Delete a program?
     isset($_GET['forget_old']) or $_GET['forget_old'] = $_POST['forget_old'];
     isset($_GET['delete'])     or $_GET['delete']     = $_POST['delete'];