Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
denise 2012-04-16 17:36:19 -04:00
parent e786514f27 da691dcfb7
commit 27e5a6db5e
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
airtime_mvc/application/controllers/DashboardController.php
View File

@ -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";

2
airtime_mvc/application/logging/Logging.php
View File

@ -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;