Merge pull request kaltura#5410 from kaltura/Lynx-12.14.0-PLAT-7194-B

Lynx-12.14.0:playmanifest attachement download/url - check asset existance
guoyu07 · Apr 5, 2017 · b321aba · b321aba
2 parents 04f53cd + f4bb8bd
commit b321aba
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/alpha/apps/kaltura/modules/extwidget/actions/playManifestAction.class.php b/alpha/apps/kaltura/modules/extwidget/actions/playManifestAction.class.php
@@ -577,16 +577,14 @@ private function shouldIncludeFlavor($flavorAsset)
 	protected function retrieveAssets()
 	{
 		//in case asset id specified, allow url and download regardless of asset type
+		//ignoring flavor-asset due to backward compat.
 		if(count($this->flavorIds) == 1 && in_array($this->deliveryAttributes->getFormat(), array(self::URL, self::DOWNLOAD)))
 		{
-			$flavorId = $this->flavorIds[0];
-			$assets = array(assetPeer::retrieveById($flavorId));
+			$asset = assetPeer::retrieveById($this->flavorIds[0]);
+			if($asset && $asset->getType() != assetType::FLAVOR && $asset->getType() != assetType::LIVE)
+				return array($asset);
 		}
-		else
-		{
-			$assets = assetPeer::retrieveReadyFlavorsByEntryId($this->entryId);
-		}
-		return $assets;
+		return assetPeer::retrieveReadyFlavorsByEntryId($this->entryId);
 	}
 
 	protected function initFlavorAssetArray()