From 2750b6aa0b892e920eeaa4e59c67319afcd52d5a Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Mon, 7 Jul 2014 15:30:18 -0400 Subject: [PATCH] Fixed unit tests in saas branch --- airtime_mvc/application/Bootstrap.php | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php index 19c924202..35c02369c 100644 --- a/airtime_mvc/application/Bootstrap.php +++ b/airtime_mvc/application/Bootstrap.php @@ -138,15 +138,17 @@ 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/playlist-preview') === false - && strpos($_SERVER['REQUEST_URI'], $baseUrl.'audiopreview/block-preview') === false) { - if (Application_Model_Preference::GetLiveChatEnabled()) { - $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'); - } + if (array_key_exists('REQUEST_URI', $_SERVER)) { //Doesn't exist for unit tests + 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/playlist-preview') === false + && strpos($_SERVER['REQUEST_URI'], $baseUrl.'audiopreview/block-preview') === false) { + if (Application_Model_Preference::GetLiveChatEnabled()) { + $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'); + } + } } /*