wait #4262 @2

diff --git a/inc/ws/Util/class.ws.links.php b/inc/ws/Util/class.ws.links.php
index 7e27735dcf46042a18c5daecf97ec9c89eb666d9..7de23e4f62d234e4497644af838cf8e9d5f7cd94 100644 (file)
--- 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 c1f279ef9e02543e8f99692e7a215633d8fbcdc1..87163a7ccfda6a3c1b8b558bc6bff72086c58508 100644 (file)
--- 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);
     }