Merge pull request kaltura#5979 from kaltura/Mercury-13.2.0-PLAT-7942

Mercury 13.2.0 plat 7942
guoyu07 · Sep 4, 2017 · 3f41ce3 · 3f41ce3
2 parents 164a2a0 + ec4ee0a
commit 3f41ce3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/alpha/apps/kaltura/lib/manifest/kManifestContributorConfig.php b/alpha/apps/kaltura/lib/manifest/kManifestContributorConfig.php
@@ -38,4 +38,9 @@ class kManifestContributorConfig
 	 */
 	public $hasSequence;
 
-}
+	/**
+	 * @var bool
+	 */
+	public $disableCaptions;
+
+}
diff --git a/alpha/apps/kaltura/modules/extwidget/actions/playManifestAction.class.php b/alpha/apps/kaltura/modules/extwidget/actions/playManifestAction.class.php
@@ -1197,6 +1197,8 @@ public function execute()
 		$config->rendererClass = get_class($renderer);
 		$config->deliveryProfile = $this->deliveryProfile;
 		$config->hasSequence = $this->deliveryAttributes->getHasValidSequence();
+		$config->disableCaptions = $this->getRequestParameter("disableCaptions", false);
+
 		$contributors = KalturaPluginManager::getPluginInstances('IKalturaPlayManifestContributor');
 		foreach ($contributors as $contributor)
 		{

diff --git a/plugins/content/caption/base/CaptionPlugin.php b/plugins/content/caption/base/CaptionPlugin.php
@@ -477,6 +477,9 @@ static protected function getLocalCaptionUrl($config, asset $captionAsset)
 	 */
 	public static function getManifestEditors ($config)
 	{
+		if($config->disableCaptions)
+			return array();
+
 		$contributors = array();
 
 		switch ($config->format)