Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cc-4347: Fixed typo

This commit is contained in:
Rudi Grinberg 2012-09-07 17:15:49 -04:00
parent a8e7cb392a
commit b4748a3b1f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
airtime_mvc/application/models/Show.php
View File

@ -1620,10 +1620,10 @@ SELECT si1.starts AS starts,
si1.last_scheduled AS last_scheduled, si1.last_scheduled AS last_scheduled,
si1.time_filled AS time_filled, si1.time_filled AS time_filled,
f.soundcloud_id f.soundcloud_id
FROM cc_show_instances AS si1 FROM cc_show_instances AS si1
LEFT JOIN cc_show_instances AS si2 ON si1.instance_id = si2.id LEFT JOIN cc_show_instances AS si2 ON si1.instance_id = si2.id
LEFT JOIN cc_show AS SHOW ON SHOW.id = si1.show_id LEFT JOIN cc_show AS show ON show.id = si1.show_id
LEFT JOIN cc_files AS f ON f.id = si1.file_id LEFT JOIN cc_files AS f ON f.id = si1.file_id
WHERE si1.modified_instance = FALSE WHERE si1.modified_instance = FALSE
SQL; SQL;
//only want shows that are starting at the time or later. //only want shows that are starting at the time or later.
@ -1638,7 +1638,7 @@ SQL;
':end' => $end_string ), 'all'); ':end' => $end_string ), 'all');
} else { } else {
$sql .= " AND ((si1.starts >= :start1::TIMESTAMPAND si1.starts < :end1::TIMESTAMP) $sql .= " AND ((si1.starts >= :start1::TIMESTAMP AND si1.starts < :end1::TIMESTAMP)
OR (si1.ends > :start2::TIMESTAMP si1.ends <= :end2::TIMESTAMP) OR (si1.ends > :start2::TIMESTAMP si1.ends <= :end2::TIMESTAMP)
OR (si1.starts <= :start3::TIMESTAMP AND si1.ends >= :end3::TIMESTAMP))"; OR (si1.starts <= :start3::TIMESTAMP AND si1.ends >= :end3::TIMESTAMP))";
return Application_Common_Database::prepareAndExecute( $sql, return Application_Common_Database::prepareAndExecute( $sql,