From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 3 Apr 2024 12:26:09 +0000 (+0200)
Subject: wait #6846 @2.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=12c2f2e213190fe3913e0672bc1fa276ea78935e;p=fluidbook-toolbox.git

wait #6846 @2.5
---

diff --git a/app/Fluidbook/PDF.php b/app/Fluidbook/PDF.php
index 19a82d510..99c1718a1 100644
--- a/app/Fluidbook/PDF.php
+++ b/app/Fluidbook/PDF.php
@@ -30,10 +30,12 @@ class PDF
         $compressedPDF = $cacheDir . 'compressed.pdf';
         $onlytextsPDF = $cacheDir . 'onlytexts.pdf';
 
-        $files = [$normalPDF, $originalPDF, $compressedPDF];
+        $files = [$normalPDF, $originalPDF, $compressedPDF, $onlytextsPDF];
 
         foreach ($files as $file) {
-            if (file_exists($file) && filesize($file) == 0) {
+            if (is_link($file)) {
+                unlink($file);
+            } else if (file_exists($file) && filesize($file) == 0) {
                 unlink($file);
             }
         }
@@ -181,8 +183,9 @@ class PDF
         if ($type === 'original') {
             return $originalPDF;
         } else if ($type === 'onlytexts') {
-            if (!file_exists($onlytextsPDF) || !filesize($onlytextsPDF) || filemtime($originalPDF) > filemtime($onlytextsPDF)) {
+            if (!file_exists($onlytextsPDF) || !filesize($onlytextsPDF) || filemtime($originalPDF) !== filemtime($onlytextsPDF)) {
                 PDFTools::filter($originalPDF, $onlytextsPDF, false, false, true);
+                touch($onlytextsPDF, filemtime($originalPDF));
             }
             return $onlytextsPDF;
         }
diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php
index b3e6e62b6..545468dce 100644
--- a/app/Models/FluidbookPublication.php
+++ b/app/Models/FluidbookPublication.php
@@ -1124,6 +1124,7 @@ class FluidbookPublication extends ToolboxStatusModel
                 $this->{$n} = $f->getAttribute('default');
             }
         }
+        $this->svgToCanvas = !$this->svgToCanvas ? 0 : 1;
         $this->save();
 
         DB::update('UPDATE ' . WorkshopMigration::OLD_DB . '.books SET version=' . $version . ' WHERE book_id=' . $this->id);