diff --git a/Classes/Dmailer.php b/Classes/Dmailer.php index f988a7190..675fa731b 100644 --- a/Classes/Dmailer.php +++ b/Classes/Dmailer.php @@ -247,8 +247,8 @@ public function prepare(array $row): void } //$this->encoding = $row['encoding']; - $this->theParts = unserialize(base64_decode($row['mailContent'])); - $this->messageid = $this->theParts['messageid']; + $this->theParts = unserialize(base64_decode((string)$row['mailContent'])) ?: []; + $this->messageid = $this->theParts['messageid'] ?? 0; $this->subject = $this->ensureCorrectEncoding($row['subject']); $this->fromEmail = $row['from_email']; $this->fromName = $this->ensureCorrectEncoding($row['from_name']); @@ -262,7 +262,7 @@ public function prepare(array $row): void $this->dmailer['sectionBoundary'] = '' . $this->dmailer['html_content']); diff --git a/Classes/Module/DmailController.php b/Classes/Module/DmailController.php index be301c2fd..0c0a5a70a 100644 --- a/Classes/Module/DmailController.php +++ b/Classes/Module/DmailController.php @@ -328,7 +328,7 @@ protected function moduleContent() $data['info']['dmail']['cmd'] = 'send_test'; // add attachment here, since attachment added in 2nd step - $unserializedMailContent = unserialize(base64_decode($row['mailContent'])); + $unserializedMailContent = unserialize(base64_decode((string)$row['mailContent'])); $temp = $this->compileQuickMail($row, $unserializedMailContent['plain']['content'] ?? '', false); if ($temp['errorTitle']) { $this->messageQueue->addMessage($this->createFlashMessage($temp['errorText'], $temp['errorTitle'], 2, false)); diff --git a/composer.json b/composer.json index c8ef80fd2..49386fbc6 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "require": { "typo3/cms-core": "^11.5", "typo3/cms-dashboard": "^11.5", - "php": "^7.4 || ^8.0 || ^8.1", + "php": "^7.4 || ^8.0 || ^8.1 || ^8.2", "friendsoftypo3/tt-address": "^6.0 || ^7.0 || ^8.0", "tedivm/fetch": "0.7.*" }, diff --git a/ext_emconf.php b/ext_emconf.php index b4fa546ad..6daaa3521 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -9,7 +9,7 @@ 'author_company' => 'd.k.d Internet Service GmbH', 'state' => 'stable', 'clearcacheonload' => 0, - 'version' => '9.5.0', + 'version' => '9.5.1', 'constraints' => [ 'depends' => [ 'typo3' => '11.5.0-11.99.99',