From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 28 Jan 2021 15:20:34 +0000 (+0000)
Subject: wait #4232 @0.25
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=63bc3c90564193f5938f69824c2deb7df27729aa;p=cubeextranet.git

wait #4232 @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 fca24f5a1..c1f279ef9 100644
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -467,6 +467,10 @@ class wsHTML5Link
         if ($this->maxWidth > 0) {
             $res .= ' data-max-width="' . $this->maxWidth . '"';
         }
+        if (!isset($this->popupClose)) {
+            $this->popupClose = 1;
+        }
+        $res .= ' data-popup-close="' . $this->popupClose . '"';
         if ($this->tooltipBackgroundColor) {
             $res .= 'data-tooltip-background="' . $this->tooltipBackgroundColor . '" ';
         }
@@ -858,7 +862,7 @@ class htmlMultimediaPopupImage extends normalLink
     {
         $this->copyExternalFile($this->alternative);
         $read = ($this->read_mode) ? 'r_' : '';
-        return '#/multimedia/' . $read . md5($this->alternative);
+        return '#/multimedia/' . $read . md5($this->alternative . '/' . $this->extra.'/'.$this->id);
     }
 
     public function getAdditionnalContent()