From 89ae221f4c87c2fd6ffcefc4a91e871647d28a4b Mon Sep 17 00:00:00 2001 From: mkonecny Date: Fri, 4 Feb 2011 18:32:57 -0500 Subject: [PATCH] -re-enabled Now playing bar --- application/Bootstrap.php | 4 ++-- application/models/Nowplaying.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/Bootstrap.php b/application/Bootstrap.php index c17fdc043..709a7ff29 100644 --- a/application/Bootstrap.php +++ b/application/Bootstrap.php @@ -60,8 +60,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $view->headScript()->appendFile('/js/libs/jquery.stickyPanel.js','text/javascript'); //scripts for now playing bar - //$this->view->headScript()->appendFile('/js/playlist/helperfunctions.js','text/javascript'); - //$this->view->headScript()->appendFile('/js/playlist/playlist.js','text/javascript'); + $this->view->headScript()->appendFile('/js/playlist/helperfunctions.js','text/javascript'); + $this->view->headScript()->appendFile('/js/playlist/playlist.js','text/javascript'); $view->headScript()->appendFile('/js/airtime/common/common.js','text/javascript'); } diff --git a/application/models/Nowplaying.php b/application/models/Nowplaying.php index c8b31155d..17b904e1c 100644 --- a/application/models/Nowplaying.php +++ b/application/models/Nowplaying.php @@ -60,10 +60,10 @@ class Application_Model_Nowplaying $date = Schedule::GetSchedulerTime(); $timeNow = $date->getDate(); $currentShow = Schedule::GetCurrentShow($timeNow); - + $groupIDs = array(); + if (count($currentShow) > 0){ $dbRows = Show_DAL::GetShowGroupIDs($currentShow[0]["id"]); - $groupIDs = array(); foreach ($dbRows as $row){ array_push($groupIDs, $row["group_id"]);