From dd9b5b32ddc1a14afce0aed09a39be2723dc8502 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Fri, 17 Nov 2023 10:43:44 +0100 Subject: [PATCH] wait #6489 @0.25 --- src/Jobs/ProcessFile.php | 4 +++- src/Links/Link.php | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Jobs/ProcessFile.php b/src/Jobs/ProcessFile.php index 818c02f..5ee4824 100644 --- 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 f23469e..d6a8173 100644 --- 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 . '{'; -- 2.39.5