From 569ea00787f04dcc47c4ec8ee154e0f37713f022 Mon Sep 17 00:00:00 2001 From: drigato Date: Tue, 3 Nov 2015 11:45:01 -0500 Subject: [PATCH] Fix for PodcastController index action when station podcast does not exist --- .../rest/controllers/PodcastController.php | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/airtime_mvc/application/modules/rest/controllers/PodcastController.php b/airtime_mvc/application/modules/rest/controllers/PodcastController.php index 241ea3e13..51013bbe2 100644 --- a/airtime_mvc/application/modules/rest/controllers/PodcastController.php +++ b/airtime_mvc/application/modules/rest/controllers/PodcastController.php @@ -27,12 +27,20 @@ class Rest_PodcastController extends Zend_Rest_Controller $sortColumn = $this->_getParam('sort', PodcastPeer::ID); $sortDir = $this->_getParam('sort_dir', Criteria::ASC); - // Don't return the Station podcast - we fetch it separately - $query = PodcastQuery::create() - ->filterByDbId(Application_Model_Preference::getStationPodcastId(), Criteria::NOT_EQUAL) - ->setLimit($limit) - ->setOffset($offset) - ->orderBy($sortColumn, $sortDir); + $stationPodcastId = Application_Model_Preference::getStationPodcastId(); + if (!empty($stationPodcastId)) { + $query = PodcastQuery::create() + // Don't return the Station podcast - we fetch it separately + ->filterByDbId($stationPodcastId, Criteria::NOT_EQUAL) + ->setLimit($limit) + ->setOffset($offset) + ->orderBy($sortColumn, $sortDir); + } else { + $query = PodcastQuery::create() + ->setLimit($limit) + ->setOffset($offset) + ->orderBy($sortColumn, $sortDir); + } $queryResult = $query->find();