CC-1665: Scheduled stream rebroadcasting and recording
-capture stream mime type and store in db.
This commit is contained in:
parent
8eea34dc39
commit
fe3f4ea678
10 changed files with 158 additions and 42 deletions
|
@ -157,7 +157,7 @@ class Application_Model_Playlist
|
|||
$files = array();
|
||||
|
||||
$sql = <<<SQL
|
||||
(SELECT *
|
||||
SELECT *
|
||||
FROM (
|
||||
(SELECT pc.id AS id,
|
||||
pc.type,
|
||||
|
@ -212,11 +212,11 @@ class Application_Model_Playlist
|
|||
JOIN cc_subjs AS sbj ON bl.creator_id=sbj.id
|
||||
WHERE pc.playlist_id = {$this->id}
|
||||
AND pc.TYPE = 2)) AS temp
|
||||
ORDER BY temp.position);
|
||||
ORDER BY temp.position;
|
||||
SQL;
|
||||
|
||||
$con = Propel::getConnection();
|
||||
$rows = $con->query($sql)->fetchAll();
|
||||
$rows = $con->query($sql)->fetchAll(PDO::FETCH_ASSOC);
|
||||
|
||||
$offset = 0;
|
||||
foreach ($rows as &$row) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue