Skip to content

Commit

Permalink
use same query in Program.php and recordinginfo.cpp
Browse files Browse the repository at this point in the history
the old code only matched via the triple title/subtitle/description
while the matching in libmythtv also uses programid etc

Fixes #10375
  • Loading branch information
dekarl committed Dec 12, 2012
1 parent 823694f commit 988923a
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions modules/tv/classes/Program.php
Expand Up @@ -581,10 +581,16 @@ public function rec_forget_old() {
// forgotten, so we have to search for matching rows
$sh = $db->query('SELECT *
FROM oldrecorded
WHERE title=? AND subtitle=? AND description=? AND future = 0',
WHERE title = ? AND
((programid = '' AND subtitle = ?
AND description = ?) OR
(programid <> '' AND programid = ?) OR
(findid <> 0 AND findid = ?))',
$this->title,
$this->subtitle,
$this->description);
$this->description,
$this->programid,
$this->findid);
while ($row = $sh->fetch_assoc()) {
$prog =& new Program($row);
MythBackend::find()->sendCommand(array('FORGET_RECORDING', $prog->backend_row(), '0'));
Expand Down

0 comments on commit 988923a

Please sign in to comment.