From dfcdc36b2da4cb7ee8067d7d4210345bf28326f1 Mon Sep 17 00:00:00 2001
From: nollm <42864489+nollm@users.noreply.github.com>
Date: Wed, 27 Nov 2024 16:44:54 +0100
Subject: [PATCH 1/2] [BUGFIX] Call to undefined method
 TYPO3\CMS\Core\Site\Entity\NullSite::getAllLanguages()

When $site is not an instance of Site, the fallback is an empty language array
---
 Classes/SelectCategories.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Classes/SelectCategories.php b/Classes/SelectCategories.php
index c24af3f3c..5b298bea4 100644
--- a/Classes/SelectCategories.php
+++ b/Classes/SelectCategories.php
@@ -17,6 +17,7 @@
 
 use DirectMailTeam\DirectMail\Repository\TempRepository;
 use TYPO3\CMS\Core\Localization\LanguageService;
+use TYPO3\CMS\Core\Site\Entity\Site;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
@@ -39,7 +40,7 @@ public function getLocalizedCategories(array &$params): void
         $lang = $this->getLang();
 
         $site = $params['site'];
-        $languages = $site->getAllLanguages();
+        $languages = ($site instanceof Site) ? $site->getAllLanguages() : [];
         foreach($languages as $language) {
             if($language->getLocale()->getLanguageCode() == $lang) {
                 $sysLanguageUid = $language->getLanguageId();

From e3c113bbacb05b97217a1c6cf9f5f7ca0aa29b1a Mon Sep 17 00:00:00 2001
From: nollm <42864489+nollm@users.noreply.github.com>
Date: Wed, 18 Dec 2024 15:40:21 +0100
Subject: [PATCH 2/2] [BUGFIX] Send Newsletter: Undefined array key "tag"

---
 Classes/Dmailer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Classes/Dmailer.php b/Classes/Dmailer.php
index 07bd932de..b606b4a50 100644
--- a/Classes/Dmailer.php
+++ b/Classes/Dmailer.php
@@ -840,7 +840,7 @@ protected function setContent(MailMessage $mailer): void
             $this->extractMediaLinks();
             foreach ($this->theParts['html']['media'] as $media) {
                 // TODO: why are there table related tags here?
-                if (in_array($media['tag'], ['img', 'table', 'tr', 'td'], true) && !$media['use_jumpurl'] && !$media['do_not_embed']) {
+                if (isset($media['tag']) && in_array($media['tag'], ['img', 'table', 'tr', 'td'], true) && !$media['use_jumpurl'] && !$media['do_not_embed']) {
                     if (ini_get('allow_url_fopen')) {
                         $context = GeneralUtility::makeInstance(FetchUtility::class)->getStreamContext();
                         if (($fp = fopen($media['absRef'], 'r', false, $context)) !== false) {