Merge pull request kaltura#5413 from kaltura/Lynx-12.14.0-PLAT-7150

make sure entries are returned
guoyu07 · Apr 4, 2017 · ad7141c · ad7141c
2 parents e946244 + 288e507
commit ad7141c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/alpha/lib/enums/syndicationFeedType.php b/alpha/lib/enums/syndicationFeedType.php
@@ -13,4 +13,6 @@ interface syndicationFeedType extends BaseEnum
 	const KALTURA_XSLT = 6;
 	const ROKU_DIRECT_PUBLISHER = 7;
 	const OPERA_TV_SNAP = 8;
+
+	const ALL_XSLT_TYPES = array(self::KALTURA_XSLT, self::ROKU_DIRECT_PUBLISHER, self::OPERA_TV_SNAP);
 }
diff --git a/api_v3/lib/syndication/KalturaFeedRenderer.php b/api_v3/lib/syndication/KalturaFeedRenderer.php
@@ -12,10 +12,8 @@ class KalturaFeedRenderer extends SyndicationFeedRenderer{
 	public function init($syndicationFeed, $syndicationFeedDB, $mimeType) {
 		parent::init($syndicationFeed, $syndicationFeedDB, $mimeType);
 
-		$allXSLTSyndicationFeeds = array(syndicationFeedType::KALTURA_XSLT, syndicationFeedType::ROKU_DIRECT_PUBLISHER, syndicationFeedType::OPERA_TV_SNAP);
-
 		$xslt = $syndicationFeed->xslt;
-		if (in_array($syndicationFeedDB->getType(), $allXSLTSyndicationFeeds) && !is_null($xslt)) {
+		if (in_array($syndicationFeedDB->getType(), syndicationFeedType::ALL_XSLT_TYPES) && !is_null($xslt)) {
 			$this->kalturaXslt = $this->createKalturaMrssXslt($xslt);
 			$this->kalturaXsltItem = $this->createKalturaItemXslt($xslt);
 		}

diff --git a/api_v3/lib/syndication/KalturaSyndicationFeedRenderer.php b/api_v3/lib/syndication/KalturaSyndicationFeedRenderer.php
@@ -526,7 +526,7 @@ public function execute($limit = 0)
 		$feedUpdatedAt = $this->syndicationFeedDb->getUpdatedAt(null);
 
 		$e = null;
-		$kalturaFeed = $this->syndicationFeed->type == KalturaSyndicationFeedType::KALTURA || $this->syndicationFeed->type == KalturaSyndicationFeedType::KALTURA_XSLT;
+		$kalturaFeed = $this->syndicationFeed->type == KalturaSyndicationFeedType::KALTURA || in_array($this->syndicationFeed->type, KalturaSyndicationFeedType::ALL_XSLT_TYPES);
 		$nextEntry = $this->getNextEntry();
 
 		$lastCreatedAtVal = null;