[TASK] Make MailContent compatible with v12 (#279)

TYPO3GmbH · May 26, 2023 · d8ef266 · d8ef266
1 parent 4a4e9be
commit d8ef266
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/Classes/Domain/Model/Post.php b/Classes/Domain/Model/Post.php
@@ -19,6 +19,8 @@
 use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
+use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
+use TYPO3\CMS\Frontend\Typolink\LinkFactory;
 
 class Post extends AbstractEntity
 {
@@ -367,6 +369,17 @@ public function getCrdateYear(): int
 
     public function getUri(): string
     {
+        if (class_exists(LinkFactory::class)) {
+            return (string) GeneralUtility::makeInstance(LinkFactory::class)->create(
+                '',
+                [
+                    'parameter' => (string) $this->getUid(),
+                    'forceAbsoluteUrl' => true
+                ],
+                GeneralUtility::makeInstance(ContentObjectRenderer::class)
+            )->getUrl();
+        }
+
         return GeneralUtility::makeInstance(UriBuilder::class)
             ->setCreateAbsoluteUri(true)
             ->setTargetPageUid((int) $this->getUid())

diff --git a/Classes/Mail/MailContent.php b/Classes/Mail/MailContent.php
@@ -33,7 +33,6 @@ protected function getFluidTemplateObject(string $template): StandaloneView
         $view->setPartialRootPaths($settings['view']['emails']['partialRootPaths']);
         $view->setTemplateRootPaths($settings['view']['emails']['templateRootPaths']);
         $view->setTemplate($template);
-        $view->getRequest()->setControllerExtensionName('blog');
 
         return $view;
     }

diff --git a/Resources/Private/Mails/Templates/CommentAdded.html b/Resources/Private/Mails/Templates/CommentAdded.html
@@ -2,7 +2,7 @@
 <f:section name="ContentSection">
     <p>
         <strong><f:translate key="email.label.post" extensionName="Blog" />: </strong>
-        <f:link.external uri="{post.uri}">{post.uri}</f:link.external>
+        <a href="{post.uri}" target="_blank">{post.uri}</a>
     </p>
     <p>
         <strong><f:translate key="email.label.date" extensionName="Blog" />: </strong>