From 8a93717415915f4a17187191c876e37b29407134 Mon Sep 17 00:00:00 2001 From: James Date: Tue, 16 Oct 2012 11:06:01 -0400 Subject: [PATCH] CC-4568: Show preview broken in Now Playing page - fixed --- .../application/controllers/AudiopreviewController.php | 1 + airtime_mvc/application/models/ShowInstance.php | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/controllers/AudiopreviewController.php b/airtime_mvc/application/controllers/AudiopreviewController.php index bd7505595..3718a86a0 100644 --- a/airtime_mvc/application/controllers/AudiopreviewController.php +++ b/airtime_mvc/application/controllers/AudiopreviewController.php @@ -278,6 +278,7 @@ class AudiopreviewController extends Zend_Controller_Action 'element_artist' => isset($track['creator']) ? $track['creator'] : "", 'element_position' => $position, 'element_id' => ++$position, + 'mime' => isset($track['mime'])?$track['mime']:"" ); $elementMap['type'] = $track['type']; diff --git a/airtime_mvc/application/models/ShowInstance.php b/airtime_mvc/application/models/ShowInstance.php index b08a0e37c..6a513aac4 100644 --- a/airtime_mvc/application/models/ShowInstance.php +++ b/airtime_mvc/application/models/ShowInstance.php @@ -677,7 +677,8 @@ FROM ( f.length AS length, f.artist_name AS creator, f.file_exists AS EXISTS, - f.filepath AS filepath + f.filepath AS filepath, + f.mime AS mime FROM cc_schedule AS s LEFT JOIN cc_files AS f ON f.id = s.file_id WHERE s.instance_id = :instance_id1 @@ -693,7 +694,8 @@ FROM ( ws.length AS length, sub.login AS creator, 't'::boolean AS EXISTS, - ws.url AS filepath + ws.url AS filepath, + ws.mime as mime FROM cc_schedule AS s LEFT JOIN cc_webstream AS ws ON ws.id = s.stream_id LEFT JOIN cc_subjs AS sub ON ws.creator_id = sub.id