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 fca24f5a133dea50d172787274177de5b182b699..c1f279ef9e02543e8f99692e7a215633d8fbcdc1 100644 (file)
--- 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()