Merge branch '2.5.x' into 2.5.x-saas
This commit is contained in:
commit
a0cae1d8f3
|
@ -456,7 +456,7 @@ class Application_Service_ShowFormService
|
||||||
$absRebroadcast = true;
|
$absRebroadcast = true;
|
||||||
|
|
||||||
$rebroadcast = true;
|
$rebroadcast = true;
|
||||||
if ($formData["add_show_rebroadcast"]) {
|
if (isset($formData["add_show_rebroadcast"]) && $formData["add_show_rebroadcast"]) {
|
||||||
$formData["add_show_duration"] = Application_Service_ShowService::formatShowDuration(
|
$formData["add_show_duration"] = Application_Service_ShowService::formatShowDuration(
|
||||||
$formData["add_show_duration"]);
|
$formData["add_show_duration"]);
|
||||||
$rebroadcast = $forms["rebroadcast"]->isValid($formData);
|
$rebroadcast = $forms["rebroadcast"]->isValid($formData);
|
||||||
|
@ -532,4 +532,4 @@ class Application_Service_ShowFormService
|
||||||
"time" => $dt->format("H:i")
|
"time" => $dt->format("H:i")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue