Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view

This commit is contained in:
Duncan Sommerville 2015-11-09 13:57:17 -05:00
commit 48f09c44ca
7 changed files with 143 additions and 61 deletions

View file

@ -253,7 +253,7 @@ class Application_Service_PodcastEpisodeService extends Application_Service_Thir
$episodes = PodcastEpisodesQuery::create()
->filterByDbPodcastId($podcastId);
if ($isStationPodcast) {
if ($isStationPodcast && $limit != 0) {
$episodes = $episodes->setLimit($limit);
}
// XXX: We should maybe try to alias this so we don't pass CcFiles as an array key to the frontend.