Ticket #12364: 0026-ticket123xx-mythweb-update-after-8c466bc.patch

mythplugins/mythweb/modules/tv/classes/Program.php

@@ -212 +212 @@
     // Get the name of the input
         if ($this->inputid) {
             $this->inputname = $db->query_col('SELECT displayname
-                                                 FROM cardinput
-                                                WHERE cardinputid=?',
+                                                 FROM capturecard
+                                                WHERE cardid=?',
                                               $this->inputid);
         }
         else {

mythplugins/mythweb/modules/tv/includes/schedule_utils.php

@@ -30 +30 @@
     // Gather the data
         if (empty($inputs)) {
             global $db;
-            $sh = $db->query('SELECT cardinputid,
+            $sh = $db->query('SELECT cardid,
                                      IF(LENGTH(IFNULL(displayname,"")) > 0,
                                         displayname,
                                         CONCAT(cardid, ":", inputname)
                                        ) AS name
-                                FROM cardinput
+                                FROM capturecard
                             ORDER BY name');
             while (list($id, $name) = $sh->fetch_row()) {
                 $inputs[$id] = $name;