From e2472f1f5d0b86b84c6918319d64fd0c9430340a Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Mon, 4 Feb 2013 16:21:56 -0500 Subject: [PATCH] CC-4913: System -> Media Folder: Exception happens when media folder's path contains '<' --- .../controllers/PreferenceController.php | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index e68e6c603..0f97756de 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -139,17 +139,13 @@ class PreferenceController extends Zend_Controller_Action { $CC_CONFIG = Config::getConfig(); - if(Application_Model_Preference::GetPlanLevel() == 'disabled'){ - - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Application_Common_OsPath::getBaseDir(); - $this->view->headScript()->appendFile($baseUrl.'js/serverbrowse/serverbrowser.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - $this->view->headScript()->appendFile($baseUrl.'js/airtime/preferences/musicdirs.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'js/serverbrowse/serverbrowser.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'js/airtime/preferences/musicdirs.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - $watched_dirs_pref = new Application_Form_WatchedDirPreferences(); - - $this->view->form = $watched_dirs_pref; - } + $watched_dirs_pref = new Application_Form_WatchedDirPreferences(); + $this->view->form = $watched_dirs_pref; } public function streamSettingAction()