Merge pull request kaltura#6542 from kaltura/revert-6473-Mercury-13.9…

….0-PLAT8354 Revert of PLAT-8354: caption for SUP-13040 - HOTFIX
guoyu07 · Dec 18, 2017 · 4cd050f · 4cd050f
2 parents 99b615d + c6ccf4f
commit 4cd050f
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/alpha/apps/kaltura/modules/extwidget/actions/serveFlavorAction.class.php b/alpha/apps/kaltura/modules/extwidget/actions/serveFlavorAction.class.php
@@ -645,15 +645,13 @@ protected function addCaptionSequences($entryIds, $captionFiles, $captionLangaug
 		$captionLangaugesArr = explode(',', $captionLangauges);
 		foreach ($captionLangaugesArr as $captionLang)
 		{
-			$labelEntryId = null;
 			$hasCaptions = false;
 			$captionClips = array();
 			foreach ($entryIds as $entryId)
 			{
 				if (isset($captionFiles[$entryId][$captionLang]))
 				{
 					$hasCaptions = true;
-					$labelEntryId = $entryId;
 					$captionClips[] = array('type' => 'source', 'path' => $captionFiles[$entryId][$captionLang][myPlaylistUtils::CAPTION_FILES_PATH]);
 				}
 				else
@@ -667,11 +665,9 @@ protected function addCaptionSequences($entryIds, $captionFiles, $captionLangaug
 				if (isset(CaptionPlugin::$captionsFormatMap[$langString]))
 					$langString = CaptionPlugin::$captionsFormatMap[$langString];
 				$currSequence = array('clips' => $captionClips, 'language' => $langString);
-				if (isset($captionFiles[$labelEntryId][$captionLang][myPlaylistUtils::CAPTION_FILES_LABEL]))
-				{
-					$currSequence['label'] = $captionFiles[$labelEntryId][$captionLang][myPlaylistUtils::CAPTION_FILES_LABEL];
-					$currSequence['id'] = $this->getServeUrlForFlavor($captionFiles[$labelEntryId][$captionLang][myPlaylistUtils::CAPTION_FILES_ID], $mainEntry->getId());
-				}
+				if (!is_null($captionFiles[$entryId][$captionLang][myPlaylistUtils::CAPTION_FILES_LABEL]))
+					$currSequence['label'] = $captionFiles[$entryId][$captionLang][myPlaylistUtils::CAPTION_FILES_LABEL];
+				$currSequence['id'] = $this->getServeUrlForFlavor($captionFiles[$entryId][$captionLang][myPlaylistUtils::CAPTION_FILES_ID], $mainEntry->getId());
 				$sequences[] = $currSequence;
 			}
 		}