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

Merge branch '2.5.x' into saas

Browse source
This commit is contained in:
Albert Santoni 2015-04-15 16:44:26 -04:00
commit f0bcc1e42b
9 changed files with 200 additions and 339 deletions
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/application/models/Scheduler.php
View file

@ -828,7 +828,8 @@ class Application_Model_Scheduler
"fade_in = '{$file["fadein"]}', ".
"fade_out = '{$file["fadeout"]}', ".
"clip_length = '{$file["cliplength"]}', ".
"position = {$pos} ".
"position = {$pos}, ".
"instance_id = {$instanceId} ".
"WHERE id = {$sched["id"]}";
Application_Common_Database::prepareAndExecute(