From 7a87b4ce9d1e807c9b4579eda7ebe128a6b0bb3e Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 19 Aug 2015 15:14:38 +0000
Subject: [PATCH] Fix external multimedia content in popup Fix multimedia
 sizing in popup

---
 inc/ws/Util/class.ws.exporter.php          | 2 +-
 inc/ws/Util/html5/class.ws.html5.links.php | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index 73e9b9e6c..167943ddf 100644
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -14,7 +14,7 @@ class wsExporter {
 	public $destinationFile;
 	public $x;
 
-	const VINCENT = "montpellier.cubedesigners.com";
+	const VINCENT = "paris.cubedesigners.com";
 
 	public function exportCollection($collectionId, $os) {
 		global $core;
diff --git a/inc/ws/Util/html5/class.ws.html5.links.php b/inc/ws/Util/html5/class.ws.html5.links.php
index 815f899a4..0f4142404 100644
--- a/inc/ws/Util/html5/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/class.ws.html5.links.php
@@ -341,6 +341,8 @@ class htmlMultimediaPopupLink extends htmlMultimediaPopupImage {
 	public function getAdditionnalContent() {
 		$i = $this->_init;
 		$i['inline'] = true;
+		$i['width'] = $i['video_width'];
+		$i['height'] = $i['video_height'];
 
 		$l = wsHTML5Link::getMultimediaInstance($this->id . '_content', $i, $this->compiler);
 		$markup = $l->getHTMLContainer();
@@ -688,7 +690,9 @@ class htmlMultimediaLink extends wsHTML5Link {
 				$res = '<iframe width="' . $iw . '" height="' . $ih . '" src="' . $this->_url . '" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" allowfullscreen mozallowfullscreen="true" webkitallowfullscreen="true" onmousewheel=""></iframe>';
 			}
 			if (isset($externalIframe)) {
-				$res = '<iframe width="' . $w . '" height="' . $h . '" src="' . $externalIframe . '" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" allowfullscreen mozallowfullscreen="true" webkitallowfullscreen="true" onmousewheel=""></iframe>';
+				$iw = $this->_config['width'];
+				$ih = $this->_config['height'];
+				$res = '<iframe width="' . $iw . '" height="' . $ih . '" src="' . $externalIframe . '" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" allowfullscreen mozallowfullscreen="true" webkitallowfullscreen="true" onmousewheel=""></iframe>';
 			}
 
 			foreach ($this->_config['inject'] as $i) {
-- 
2.39.5