Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge of cc-5709-airtime-analyzer-saas-refactor into saas

Browse source
This commit is contained in:
Albert Santoni 2015-02-20 14:27:16 -05:00
parent 70f5bd3748
commit 2e2c3d6276
12 changed files with 627 additions and 468 deletions
Download patch file Download diff file Expand all files Collapse all files

9
airtime_mvc/application/controllers/AudiopreviewController.php
View file

@ -22,8 +22,6 @@ class AudiopreviewController extends Zend_Controller_Action
$CC_CONFIG = Config::getConfig();
$audioFileID = $this->_getParam('audioFileID');
$audioFileArtist = $this->_getParam('audioFileArtist');
$audioFileTitle = $this->_getParam('audioFileTitle');
$type = $this->_getParam('type');
$baseUrl = Application_Common_OsPath::getBaseDir();
@ -60,10 +58,9 @@ class AudiopreviewController extends Zend_Controller_Action
$this->view->uri = $uri;
$this->view->mime = $mime;
$this->view->audioFileID = $audioFileID;
// We need to decode artist and title because it gets
// encoded twice in js
$this->view->audioFileArtist = htmlspecialchars(urldecode($audioFileArtist));
$this->view->audioFileTitle = htmlspecialchars(urldecode($audioFileTitle));
$this->view->audioFileArtist = htmlspecialchars($media->getPropelOrm()->getDbArtistName());
$this->view->audioFileTitle = htmlspecialchars($media->getPropelOrm()->getDbTrackTitle());
$this->view->type = $type;
$this->_helper->viewRenderer->setRender('audio-preview');