From f660e1da9f256f08ee62f237e9cffe65dd87be35 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 4 Sep 2012 15:31:09 -0400 Subject: [PATCH] removed useless code --- airtime_mvc/application/models/Schedule.php | 6 +++--- airtime_mvc/application/models/Show.php | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php index 176c88f3c..ccb11f066 100644 --- a/airtime_mvc/application/models/Schedule.php +++ b/airtime_mvc/application/models/Schedule.php @@ -356,9 +356,9 @@ SQL; ." SET media_item_played=TRUE"; // we need to update 'broadcasted' column as well // check the current switch status - $live_dj = Application_Model_Preference::GetSourceSwitchStatus('live_dj') == 'on'?true:false; - $master_dj = Application_Model_Preference::GetSourceSwitchStatus('master_dj') == 'on'?true:false; - $scheduled_play = Application_Model_Preference::GetSourceSwitchStatus('scheduled_play') == 'on'?true:false; + $live_dj = Application_Model_Preference::GetSourceSwitchStatus('live_dj') == 'on'; + $master_dj = Application_Model_Preference::GetSourceSwitchStatus('master_dj') == 'on'; + $scheduled_play = Application_Model_Preference::GetSourceSwitchStatus('scheduled_play') == 'on'; if (!$live_dj && !$master_dj && $scheduled_play) { $sql .= ", broadcasted=1"; diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php index ea6762060..d9c6c834c 100644 --- a/airtime_mvc/application/models/Show.php +++ b/airtime_mvc/application/models/Show.php @@ -475,10 +475,9 @@ class Application_Model_Show ->filterByDbShowId($this->_showId) ->findOne(); - if (!is_null($showDaysRow)) { + if (!is_null($showDaysRow)) return $showDaysRow->getDbRepeatType(); - } else - + else return -1; }