From c08800468f2af25e51076bd0b546b4cf57dff496 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Mon, 16 Apr 2012 17:29:02 -0400
Subject: [PATCH] CC-3658: DJ assigned to the Show can't switch/kick streams

- fixed
---
 airtime_mvc/application/controllers/DashboardController.php | 3 +--
 airtime_mvc/application/logging/Logging.php                 | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/airtime_mvc/application/controllers/DashboardController.php b/airtime_mvc/application/controllers/DashboardController.php
index 9a30348a2..ddef27cbe 100644
--- a/airtime_mvc/application/controllers/DashboardController.php
+++ b/airtime_mvc/application/controllers/DashboardController.php
@@ -50,10 +50,9 @@ class DashboardController extends Zend_Controller_Action
         $user = new Application_Model_User($userInfo->id);
         
         $show = Application_Model_Show::GetCurrentShow();
-        $show_id = isset($show['id'])?$show['id']:0;
+        $show_id = isset($show[0]['id'])?$show[0]['id']:0;
         
         $source_connected = Application_Model_Preference::GetSourceStatus($sourcename);
-        
         if($user->canSchedule($show_id) && ($source_connected || $sourcename == 'scheduled_play')){
         
             $change_status_to = "on";
diff --git a/airtime_mvc/application/logging/Logging.php b/airtime_mvc/application/logging/Logging.php
index a98b932d7..5c25b831f 100644
--- a/airtime_mvc/application/logging/Logging.php
+++ b/airtime_mvc/application/logging/Logging.php
@@ -18,7 +18,7 @@ class Logging {
     }
     
     public static function toString($p_msg){
-        if (is_array($p_msg)){
+        if (is_array($p_msg) || is_object($p_msg)){
             return print_r($p_msg, true);
         } else {
             return $p_msg;