Merge branch 'saas-file-sanitization' into saas

Conflicts: airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-18 17:19:26 -05:00 · 2015-02-18 17:19:26 -05:00 · 0535626df1
commit 0535626df1
parent b76ab27230 9098e204e5
2 changed files with 1 additions and 4 deletions
--- a/airtime_mvc/application/modules/rest/controllers/MediaController.php
+++ b/airtime_mvc/application/modules/rest/controllers/MediaController.php
@ -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