Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Naomi Aro 2012-04-17 19:00:57 +02:00
parent 4732c0ad67 29e24d1847
commit 467fbc2c4b
1 changed files with 1 additions and 3 deletions
airtime_mvc/application/controllers
ScheduleController.php

4
airtime_mvc/application/controllers/ScheduleController.php
View File

@ -227,8 +227,7 @@ class ScheduleController extends Zend_Controller_Action
$showStartLocalDT = Application_Common_DateHelper::ConvertToLocalDateTime($instance->getShowInstanceStart());
$showEndLocalDT = Application_Common_DateHelper::ConvertToLocalDateTime($instance->getShowInstanceEnd());
if ($epochNow < $showEndLocalDT->getTimestamp()) {
if ($epochNow < $showStartLocalDT->getTimestamp()) {
if ( ($isAdminOrPM || $isDJ)
&& !$instance->isRecorded()
&& !$instance->isRebroadcast()) {
@ -239,7 +238,6 @@ class ScheduleController extends Zend_Controller_Action
$menu["clear"] = array("name"=> "Remove All Content", "icon" => "remove-all-content",
"url" => "/schedule/clear-show");
}
}
if (!$instance->isRecorded()) {