Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'saas' into saas-media-refactor

Browse source 
Conflicts:
	airtime_mvc/application/modules/rest/controllers/MediaController.php
This commit is contained in:
Albert Santoni 2015-02-26 14:26:33 -05:00
commit f1a311dad6
4 changed files with 62 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

1
airtime_mvc/application/modules/rest/controllers/MediaController.php
View file

@ -119,6 +119,7 @@ class Rest_MediaController extends Zend_Rest_Controller
try {
$requestData = json_decode($this->getRequest()->getRawBody(), true);
$sanitizedFile = CcFiles::updateFromArray($id, $requestData);
$this->getResponse()
->setHttpResponseCode(201)
->appendBody(json_encode($sanitizedFile));