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

Fixed unit tests in saas branch

This commit is contained in:
Albert Santoni 2014-07-07 15:30:18 -04:00
parent 0b41cd1d38
commit 2750b6aa0b
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
airtime_mvc/application/Bootstrap.php
View File

@ -138,15 +138,17 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
$view->headScript()->appendScript("var userType = '$userType';"); $view->headScript()->appendScript("var userType = '$userType';");
if (strpos($_SERVER['REQUEST_URI'], $baseUrl.'Dashboard/stream-player') === false if (array_key_exists('REQUEST_URI', $_SERVER)) { //Doesn't exist for unit tests
&& strpos($_SERVER['REQUEST_URI'], $baseUrl.'audiopreview/audio-preview') === false if (strpos($_SERVER['REQUEST_URI'], $baseUrl.'Dashboard/stream-player') === false
&& strpos($_SERVER['REQUEST_URI'], $baseUrl.'audiopreview/playlist-preview') === false && strpos($_SERVER['REQUEST_URI'], $baseUrl.'audiopreview/audio-preview') === false
&& strpos($_SERVER['REQUEST_URI'], $baseUrl.'audiopreview/block-preview') === false) { && strpos($_SERVER['REQUEST_URI'], $baseUrl.'audiopreview/playlist-preview') === false
if (Application_Model_Preference::GetLiveChatEnabled()) { && strpos($_SERVER['REQUEST_URI'], $baseUrl.'audiopreview/block-preview') === false) {
$client_id = Application_Model_Preference::GetClientId(); if (Application_Model_Preference::GetLiveChatEnabled()) {
$view->headScript()->appendScript("var livechat_client_id = '$client_id';"); $client_id = Application_Model_Preference::GetClientId();
$view->headScript()->appendFile($baseUrl . 'js/airtime/common/livechat.js?'.$CC_CONFIG['airtime_version'], 'text/javascript'); $view->headScript()->appendScript("var livechat_client_id = '$client_id';");
} $view->headScript()->appendFile($baseUrl . 'js/airtime/common/livechat.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
}
}
} }
/* /*