CC-4913: System -> Media Folder: Exception happens when media folder's path contains '<'
This commit is contained in:
parent
5ce86b33ef
commit
e2472f1f5d
|
@ -139,17 +139,13 @@ class PreferenceController extends Zend_Controller_Action
|
||||||
{
|
{
|
||||||
$CC_CONFIG = Config::getConfig();
|
$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/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/airtime/preferences/musicdirs.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
|
||||||
|
|
||||||
$watched_dirs_pref = new Application_Form_WatchedDirPreferences();
|
$watched_dirs_pref = new Application_Form_WatchedDirPreferences();
|
||||||
|
$this->view->form = $watched_dirs_pref;
|
||||||
$this->view->form = $watched_dirs_pref;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function streamSettingAction()
|
public function streamSettingAction()
|
||||||
|
|
Loading…
Reference in New Issue