Merge branch 'saas' into saas-speedy

2015-04-15 16:44:43 -04:00 · 2015-04-15 16:44:43 -04:00 · 8449194ca1
commit 8449194ca1
parent f3c8f40183 f0bcc1e42b
51 changed files with 4395 additions and 640 deletions
--- a/airtime_mvc/application/models/Scheduler.php
+++ b/airtime_mvc/application/models/Scheduler.php
@ -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(