From 96da822bc7ca67ca9ef489588b595529bc61ea75 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 16 Oct 2012 14:38:24 -0400
Subject: [PATCH 1/2] CC-4574: Audio preview fails with Zend errors on file
 with question mark in the title

- fixed
---
 airtime_mvc/public/js/airtime/common/common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/public/js/airtime/common/common.js b/airtime_mvc/public/js/airtime/common/common.js
index aa449dddf..3125d8d55 100644
--- a/airtime_mvc/public/js/airtime/common/common.js
+++ b/airtime_mvc/public/js/airtime/common/common.js
@@ -54,7 +54,7 @@ function open_audio_preview(type, id, audioFileTitle, audioFileArtist) {
         audioFileTitle = audioFileTitle.substring(0,index);
     }
 
-    openPreviewWindow('audiopreview/audio-preview/audioFileID/'+id+'/audioFileArtist/'+audioFileArtist+'/audioFileTitle/'+audioFileTitle+'/type/'+type);
+    openPreviewWindow('audiopreview/audio-preview/audioFileID/'+id+'/audioFileArtist/'+encodeURIComponent(audioFileArtist)+'/audioFileTitle/'+encodeURIComponent(audioFileTitle)+'/type/'+type);
 
     _preview_window.focus();
 }

From 562c5099396ec2cd286e7b325dbbcde96736f2ee Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 16 Oct 2012 14:51:14 -0400
Subject: [PATCH 2/2] CC-4570: blockId and blockIndex are visible at top of
 smart block preview pop-up

- fixed
---
 .../views/scripts/audiopreview/audio-preview.phtml          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml b/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml
index b4ec52bdf..f76249b9f 100644
--- a/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml
+++ b/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml
@@ -4,8 +4,8 @@
     <span class='playlistID'><?php echo "$this->playlistID" ?></span>
     <span class='playlistIndex'><?php echo "$this->playlistIndex" ?></span>
 <?php elseif (isset($this->blockId)): ?>
-    <span class='blockId'><?php echo "$this->blockId" ?></span>
-    <span class='blockIndex'><?php echo "$this->blockIndex" ?></span>
+    <span class='blockId' style="display: none;"><?php echo "$this->blockId" ?></span>
+    <span class='blockIndex' style="display: none;"><?php echo "$this->blockIndex" ?></span>
 <?php elseif (isset($this->uri)): ?>
     <span class='audioUri' style="display: none;"><?php echo "$this->uri" ?></span>
     <span class='audioMime' style="display: none;"><?php echo "$this->mime" ?></span>
@@ -51,7 +51,7 @@
                 </div>
                 <div class="jp-unmute">
                     <span class="ui-icon" tabindex="1" title="unmute">unmute</span>
-                </div> 
+                </div>
                 <div class="jp-volume-bar">
                     <div class="jp-volume-bar-value"></div>
                 </div>