wait #4137 @0.25

diff --git a/inc/ws/Util/html5/master/class.ws.html5.links.php b/inc/ws/Util/html5/master/class.ws.html5.links.php
index ac1fe64582ce362fc58c4aeb67fc0f6ee17d23f4..7237a76d6a8091b67d40dff583290d81bb82a657 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -118,10 +118,11 @@ class wsHTML5Link
             case 9:
                 return null;
             case 10:
-                if ($init['inline']) {
-                    return new webVideoLink($id, $init, $compiler);
+                $init['inline'] = self::normalizeInlineIntegration($init['inline']);
+                if ($init['inline'] === 'popup') {
+                    return new webVideoPopupLink($id, $init, $compiler);
                 }
-                return new webVideoPopupLink($id, $init, $compiler);
+                return new webVideoLink($id, $init, $compiler);
             case 11:
                 return new actionLink($id, $init, $compiler);
             case 12:
@@ -841,7 +842,7 @@ class htmlMultimediaPopupImage extends normalLink
     public function getAdditionnalContent()
     {
         $res = parent::getAdditionnalContent();
-        $dim = getimagesize($this->wdir . '/' . $this->alternative);
+        $dim = CubeIT_Image::getimagesize($this->wdir . '/' . $this->alternative);
 
         $markup = '<div class="multimediaContainer "><img data-width="' . $dim[0] . '" data-height="' . $dim[1] . '" src="' . wsHTML5Link::getUniversalLocation($this->alternative) . '" width="' . $dim[0] . '" height="' . $dim[1] . '" class="multimedia" /></div>';
         $read = '';