From a1e8903a64641f64ed1b2322fe519d9dfe671b24 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Wed, 22 Feb 2012 22:25:14 +0100
Subject: [PATCH] CC-3174 : showbuilder

fixing some errors found in apache log.
---
 airtime_mvc/application/controllers/ShowbuilderController.php | 2 --
 airtime_mvc/application/models/Show.php                       | 4 ++--
 airtime_mvc/application/models/ShowBuilder.php                | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php
index ba1d683f8..b4f13e631 100644
--- a/airtime_mvc/application/controllers/ShowbuilderController.php
+++ b/airtime_mvc/application/controllers/ShowbuilderController.php
@@ -102,8 +102,6 @@ class ShowbuilderController extends Zend_Controller_Action
             Logging::log("{$e->getFile()}");
             Logging::log("{$e->getLine()}");
         }
-
-        $this->view->data = $json;
     }
 
     public function scheduleRemoveAction()
diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php
index c46729e3e..ec4cdbcfe 100644
--- a/airtime_mvc/application/models/Show.php
+++ b/airtime_mvc/application/models/Show.php
@@ -1396,7 +1396,7 @@ class Application_Model_Show {
             Application_Model_Preference::SetShowsPopulatedUntil($end_timestamp);
         }
 
-        $sql = "SELECT starts, ends, record, rebroadcast, instance_id, show_id, name, 
+        $sql = "SELECT starts, ends, record, rebroadcast, instance_id, show_id, name,
                 color, background_color, file_id, cc_show_instances.id AS instance_id
             FROM cc_show_instances
             LEFT JOIN cc_show ON cc_show.id = cc_show_instances.show_id
@@ -1538,7 +1538,7 @@ class Application_Model_Show {
         $event["end"] = $endDateTime->format("Y-m-d H:i:s");
         $event["endUnix"] = $endDateTime->format("U");
         $event["allDay"] = false;
-        $event["description"] = $show["description"];
+        //$event["description"] = $show["description"];
         $event["showId"] = intval($show["show_id"]);
         $event["record"] = intval($show["record"]);
         $event["rebroadcast"] = intval($show["rebroadcast"]);
diff --git a/airtime_mvc/application/models/ShowBuilder.php b/airtime_mvc/application/models/ShowBuilder.php
index 01dc84636..01fe8561d 100644
--- a/airtime_mvc/application/models/ShowBuilder.php
+++ b/airtime_mvc/application/models/ShowBuilder.php
@@ -116,7 +116,7 @@ class Application_Model_ShowBuilder {
     private function makeHeaderRow($p_item) {
 
         $row = $this->defaultRowArray;
-        $this->getRowTimestamp($p_item, &$row);
+        $this->getRowTimestamp($p_item, $row);
 
         $showStartDT = new DateTime($p_item["si_starts"], new DateTimeZone("UTC"));
         $showStartDT->setTimezone(new DateTimeZone($this->timezone));
@@ -140,7 +140,7 @@ class Application_Model_ShowBuilder {
         $epoch_now = time();
 
         $showStartDT = new DateTime($p_item["si_starts"], new DateTimeZone("UTC"));
-        $this->getRowTimestamp($p_item, &$row);
+        $this->getRowTimestamp($p_item, $row);
 
         //can only schedule the show if it hasn't started and you are allowed.
         if ($epoch_now < $showStartDT->format('U') && $this->user->canSchedule($p_item["show_id"]) == true) {