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

Merge branch 'saas-dev-publishing' into saas-dev-publishing-schema-change

Browse source 
Conflicts:
	airtime_mvc/application/models/airtime/Podcast.php
This commit is contained in:
drigato 2015-10-14 11:04:41 -04:00
commit c166b4f00e
37 changed files with 540 additions and 277 deletions
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/application/modules/rest/controllers/PodcastController.php
View file

@ -92,9 +92,6 @@ class Rest_PodcastController extends Zend_Rest_Controller
$this->_helper->json->sendJson(array(
"podcast"=>json_encode($podcast),
"html"=>$this->view->render($path),
"type"=>"podcast", // TODO: get rid of these extraneous fields
"id"=>$podcast["id"]
// "id"=>$podcast->getDbId()
));
}
catch (PodcastLimitReachedException $e) {