From 109b313d37f729f5b7bee7a70c4e24bcd7299cc6 Mon Sep 17 00:00:00 2001
From: Naomi <naomiaro@gmail.com>
Date: Wed, 16 Oct 2013 12:26:39 -0400
Subject: [PATCH] CC-5424 : Same webstream playing will switch off ON AIR light

---
 airtime_mvc/application/models/Schedule.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php
index 3884f488b..231733828 100644
--- a/airtime_mvc/application/models/Schedule.php
+++ b/airtime_mvc/application/models/Schedule.php
@@ -814,7 +814,6 @@ SQL;
             'start'             => $start,
             'end'               => $end,
             'show_name'         => $item["show_name"],
-            'row_id'            => $item["id"],
             'independent_event' => true
         );
         self::appendScheduleItem($data, $start, $schedule_item);
@@ -909,12 +908,14 @@ SQL;
                 $storedFile = Application_Model_StoredFile::RecallById($media_id);
                 $uri = $storedFile->getFilePath();
                 self::createFileScheduleEvent($data, $item, $media_id, $uri);
-            } elseif (!is_null($item['stream_id'])) {
+            } 
+            elseif (!is_null($item['stream_id'])) {
                 //row is type "webstream"
                 $media_id = $item['stream_id'];
                 $uri = $item['url'];
                 self::createStreamScheduleEvent($data, $item, $media_id, $uri);
-            } else {
+            } 
+            else {
                 throw new Exception("Unknown schedule type: ".print_r($item, true));
             }
 
@@ -991,7 +992,7 @@ SQL;
         self::createInputHarborKickTimes($data, $range_start, $range_end);
         self::createScheduledEvents($data, $range_start, $range_end);
 
-        self::foldData($data["media"]);
+        //self::foldData($data["media"]);
         return $data;
     }