Merge branch 'saas-file-sanitization' into saas
Conflicts: airtime_mvc/application/modules/rest/controllers/MediaController.php
This commit is contained in:
commit
0535626df1
|
@ -421,9 +421,6 @@ class LibraryController extends Zend_Controller_Action
|
|||
|
||||
$request = $this->getRequest();
|
||||
|
||||
|
||||
|
||||
|
||||
$file_id = $this->_getParam('id', null);
|
||||
$file = Application_Model_StoredFile::RecallById($file_id);
|
||||
|
||||
|
@ -449,7 +446,6 @@ class LibraryController extends Zend_Controller_Action
|
|||
|
||||
if ($form->isValid($serialized)) {
|
||||
$file->setDbColMetadata($serialized);
|
||||
$this->_redirect('Library');
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -204,6 +204,7 @@ class Rest_MediaController extends Zend_Rest_Controller
|
|||
|
||||
//local file storage
|
||||
$file->setDbDirectory(self::MUSIC_DIRS_STOR_PK);
|
||||
|
||||
$file->fromArray($whiteList, BasePeer::TYPE_FIELDNAME);
|
||||
//Our RESTful API takes "full_path" as a field, which we then split and translate to match
|
||||
//our internal schema. Internally, file path is stored relative to a directory, with the directory
|
||||
|
|
Loading…
Reference in New Issue