Merge branch '2.5.x' into cc-5594-date_default

airtime_mvc/application/services/ShowFormService.php

@@ -131,7 +131,7 @@ class Application_Service_ShowFormService
         }
 
         $showStart = $ccShowDay->getLocalStartDateAndTime();
-        $showEnd = $ccShowDay->getLocalEndDateAndTime($showStart);
+        $showEnd = $ccShowDay->getLocalEndDateAndTime();
 
         //check if the first show is in the past
         if ($ccShowDay->isShowStartInPast()) {

airtime_mvc/application/services/ShowService.php

@@ -134,9 +134,6 @@ class Application_Service_ShowService
             $updateCriteria->add(CcSchedulePeer::INSTANCE_ID, $ccShowInstance->getDbId());
             BasePeer::doUpdate($selectCriteria, $updateCriteria, $con);
 
-            $ccShowInstance
-                ->setDbLastScheduled(gmdate("Y-m-d H:i:s"))
-                ->save();
             $ccShowInstance->updateDbTimeFilled($con);
             $ccShowInstance->updateScheduleStatus($con);