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

Merge branch '2.2.x-saas' of dev.sourcefabric.org:airtime into 2.2.x-saas

Browse source
This commit is contained in:
Martin Konecny 2012-10-23 17:53:43 -04:00
commit 1ed8d37e12
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/application/Bootstrap.php
View file

@ -94,7 +94,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
$view->headScript()->appendScript("var userType = '$userType';");
if (strpos($_SERVER['REQUEST_URI'], $baseUrl.'/Dashboard/stream-player') === false
&& strpos($_SERVER['REQUEST_URI'], $baseUrl.'/audiopreview/audio-preview') === false) {
&& strpos($_SERVER['REQUEST_URI'], $baseUrl.'/audiopreview/audio-preview') === false
&& strpos($_SERVER['REQUEST_URI'], $baseUrl.'/audiopreview/playlist-preview') === false) {
$client_id = Application_Model_Preference::GetClientId();
$view->headScript()->appendScript("var livechat_client_id = '$client_id';");
$view->headScript()->appendFile($baseUrl . '/js/airtime/common/livechat.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');