wait #5932 @0.75

diff --git a/src/Compiler/Links.php b/src/Compiler/Links.php
index 709b15edc769b1b3dab04a7cea80133fad16d55c..2518c081a6144fd13caadecf26a36e5dc28090ef 100644 (file)
--- a/src/Compiler/Links.php
+++ b/src/Compiler/Links.php
@@ -184,7 +184,7 @@ trait Links {
             // Make old "aftersearch" link compatible with new "extra" menu option by extracting link URL
             if ($link->page == 'aftersearch') {
                 $this->config->afterSearchLink = $link->to;
-                $this->config->afterSearchTooltip = $link->infobulle;
+                $this->config->afterSearchTooltip = $link->tooltip;
             }
 
             if (strpos($link->page, 'link_') === 0) {
@@ -264,7 +264,7 @@ trait Links {
                 }
                 $link = ['uid' => self::makeUID()];
 
-                $cols = ['page' => '', 'left' => '', 'top' => '', 'width' => '', 'height' => '', 'type' => '', 'to' => '', 'target' => '_blank', 'video_loop' => true, 'video_auto_start' => true, 'video_controls' => true, 'video_sound_on' => true, 'infobulle' => '', 'image_rollover' => '', 'numerotation' => 'physical', "inline" => true];
+                $cols = ['page' => '', 'left' => '', 'top' => '', 'width' => '', 'height' => '', 'type' => '', 'to' => '', 'target' => '_blank', 'video_loop' => true, 'video_auto_start' => true, 'video_controls' => true, 'video_sound_on' => true, 'tooltip' => '', 'image_rollover' => '', 'numerotation' => 'physical', "inline" => true];
 
                 $k = 0;
 
@@ -284,7 +284,7 @@ trait Links {
                 }
 
                 if ($link['type'] == 18) {
-                    $link['infobulle'] = $link['to'];
+                    $link['tooltip'] = $link['to'];
                     $link['to'] = '';
                 }
 

diff --git a/src/Links/CustomLink.php b/src/Links/CustomLink.php
index b265b508928d90fda5d986dcfe2ca74236fee730..f105db6c30fbd6d39740dea11f212b6692f13220 100644 (file)
--- a/src/Links/CustomLink.php
+++ b/src/Links/CustomLink.php
@@ -46,7 +46,7 @@ class CustomLink extends NormalLink
         if ($e[0] == '10doigts') {
             $init['to'] = self::_getURL($init['to']);
             $init['iframeType'] = '10doigts';
-            $init['infobulle'] = 'Voir le produit';
+            $init['tooltip'] = 'Voir le produit';
             return new IFramePopupLink($id, $init, $compiler);
         }
         return new CustomLink($id, $init, $compiler);

diff --git a/src/Links/Link.php b/src/Links/Link.php
index 69f2f968302398dfef3854443e2c4f954e3a37c3..8d224e25155844d7098bcb6841f0d016b14a22e2 100644 (file)
--- a/src/Links/Link.php
+++ b/src/Links/Link.php
@@ -93,7 +93,7 @@ class Link {
     public $display_area;
     public $read_mode;
     public $group;
-    public $infobulle;
+    public $tooltip;
     public $blendmode = "normal";
     public $extra;
     public $id;
@@ -510,13 +510,13 @@ class Link {
     }
 
     public function getTooltip() {
-        if ($this->infobulle === null || !$this->infobulle) {
-            if ($this->getDefaultTooltip() === false) {
+        if (!$this->tooltip) {
+            if (!$this->getDefaultTooltip()) {
                 return '';
             }
             return '~' . $this->getDefaultTooltip();
         }
-        return $this->infobulle;
+        return $this->tooltip;
     }
 
 

diff --git a/src/Links/TextPopupLink.php b/src/Links/TextPopupLink.php
index cac0fe3eecf3880c06dfa27e9fb28e209f84016c..3f7fe07b0cb5fc7410d1e927d7e9944ea36c326b 100644 (file)
--- a/src/Links/TextPopupLink.php
+++ b/src/Links/TextPopupLink.php
@@ -12,7 +12,7 @@ class TextPopupLink extends NormalLink
     public function getAdditionnalContent()
     {
         $res = parent::getAdditionnalContent();
-        $res .= ' data-text="' . htmlspecialchars($this->infobulle, ENT_QUOTES) . '" ';
+        $res .= ' data-text="' . htmlspecialchars($this->tooltip, ENT_QUOTES) . '" ';
         return $res;
     }