Ticket #1054: mythweb.oldrecorded.diff

includes/programs.php

@@ -128 +128 @@
                   FROM program
                        LEFT JOIN programrating USING (chanid, starttime)
                        LEFT JOIN oldrecorded
-                                 ON LENGTH(IFNULL(oldrecorded.seriesid, "")) > 0
-                                    AND LENGTH(IFNULL(oldrecorded.programid, "")) > 0
-                                    AND oldrecorded.programid = program.programid
-                                    AND oldrecorded.seriesid  = program.seriesid
+                                 ON oldrecorded.programid = program.programid
+                                    AND oldrecorded.seriesid = program.seriesid
+                                    AND (oldrecorded.recstatus = -3
+                                        OR ((LENGTH(IFNULL(oldrecorded.seriesid, "")) > 0
+                                        AND LENGTH(IFNULL(oldrecorded.programid, "")) > 0)))
                  WHERE';
     // Only loading a single channel worth of information
         if ($chanid > 0)