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

no const arrays
guoyu07 · Apr 4, 2017 · 168a833 · 168a833
2 parents ad7141c + a4305ba
commit 168a833
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/alpha/lib/enums/syndicationFeedType.php b/alpha/lib/enums/syndicationFeedType.php
@@ -14,5 +14,4 @@ interface syndicationFeedType extends BaseEnum
 	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
@@ -13,7 +13,7 @@ public function init($syndicationFeed, $syndicationFeedDB, $mimeType) {
 		parent::init($syndicationFeed, $syndicationFeedDB, $mimeType);
 
 		$xslt = $syndicationFeed->xslt;
-		if (in_array($syndicationFeedDB->getType(), syndicationFeedType::ALL_XSLT_TYPES) && !is_null($xslt)) {
+		if (in_array($syndicationFeedDB->getType(), array(syndicationFeedType::KALTURA_XSLT, syndicationFeedType::ROKU_DIRECT_PUBLISHER, syndicationFeedType::OPERA_TV_SNAP)) && !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 || in_array($this->syndicationFeed->type, KalturaSyndicationFeedType::ALL_XSLT_TYPES);
+		$kalturaFeed = $this->syndicationFeed->type == KalturaSyndicationFeedType::KALTURA || in_array($this->syndicationFeed->type, array(KalturaSyndicationFeedType::KALTURA_XSLT, KalturaSyndicationFeedType::ROKU_DIRECT_PUBLISHER, KalturaSyndicationFeedType::OPERA_TV_SNAP));
 		$nextEntry = $this->getNextEntry();
 
 		$lastCreatedAtVal = null;