From 409472321e7f34bee73cbfaacc81ee9295521388 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 17 Feb 2021 12:05:05 +0000
Subject: [PATCH] wait #4262 @2

---
 inc/ws/Util/class.ws.links.php                    | 14 +++++++-------
 inc/ws/Util/html5/master/class.ws.html5.links.php |  4 +++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/inc/ws/Util/class.ws.links.php b/inc/ws/Util/class.ws.links.php
index 7e27735dc..7de23e4f6 100644
--- a/inc/ws/Util/class.ws.links.php
+++ b/inc/ws/Util/class.ws.links.php
@@ -68,7 +68,7 @@ class wsLinks
 
                     if (isset($l[$id])) {
                         if (is_bool($l[$id])) {
-                            $l[$id] = $l[$id] ? 1 : 0;
+                            $l[$id] = $l[$id] ? '1' : '0';
                         }
                         if ($id === 'numerotation') {
                             if ($l[$id] === 'false') {
@@ -94,10 +94,10 @@ class wsLinks
                         $value = '';
                     }
                 }
-                if ($value != '') {
-                    $s->setCellValueExplicitByColumnAndRow($i, $j, $value);
-                    //$s->getStyleByColumnAndRow($i, $j)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
-                }
+
+                $s->setCellValueExplicitByColumnAndRow($i, $j, $value);
+                //$s->getStyleByColumnAndRow($i, $j)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
+
                 $i++;
             }
             $j++;
@@ -201,8 +201,8 @@ class wsLinks
                     $link[$cols[$j]] = $cell->getValue();
                     $j++;
                 }
-                if ($link['display_area'] == '') {
-                    $link['display_area'] = '1';
+                if ($link['display_area'] == '' || !$link['display_area']) {
+                    $link['display_area'] = '0';
                 }
                 if (trim($link['infobulle']) == '') {
                     $link['infobulle'] = '';
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 c1f279ef9..87163a7cc 100644
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -1586,10 +1586,12 @@ class fileLink extends normalLink
 
     public function getURL()
     {
+        $this->copyExternalFile($this->to);
+
         if ($this->compiler->book->parametres->linkFilePrefix && !CubeIT_Util_Url::isDistant($this->to)) {
             return $this->compiler->book->parametres->linkFilePrefix . $this->to;
         }
-        $this->copyExternalFile($this->to);
+
         return wsHTML5Link::getUniversalLocation($this->to);
     }
 
-- 
2.39.5