wait #6489 @0.25

diff --git a/src/Jobs/ProcessFile.php b/src/Jobs/ProcessFile.php
index 818c02fd7309519bd2909e774c201a6891863c20..5ee4824234b333e3925303d5268ff343cbe2f372 100644 (file)
--- a/src/Jobs/ProcessFile.php
+++ b/src/Jobs/ProcessFile.php
@@ -56,7 +56,9 @@ class ProcessFile
      */
     public function getFormat(): string
     {
-        if ($this->format === 'jpeg') {
+        if ($this->format === null) {
+            return 'jpg';
+        } else if ($this->format === 'jpeg') {
             return 'jpg';
         }
         return $this->format;

diff --git a/src/Links/Link.php b/src/Links/Link.php
index f23469e6ea552bf97e10c6a396891559c72dc9c1..d6a81735f7e1324a0cc977db2f30356dae3783c7 100644 (file)
--- a/src/Links/Link.php
+++ b/src/Links/Link.php
@@ -136,6 +136,8 @@ class Link
 
     public $attached = false;
 
+    public $attachLeft = false;
+
     protected static $_encryptedTypes = [14, 15, 35, 39];
     protected static $_encryptedAttributes = ['image_rollover'];
 
@@ -689,7 +691,7 @@ class Link
 
     public function moveOnEvenPage()
     {
-        return false;
+        return $this->attachLeft;
     }
 
     public function getCSSContainer()
@@ -704,7 +706,7 @@ class Link
     {
         if ($this->moveOnEvenPage()) {
             $this->page--;
-            $this->left += $this->compiler->getWidth();
+            $this->left += $this->compiler->getWidthForLinks();
         }
 
         $css = '#l_' . $this->id . '{';