use translated recipient records in T3 11.5

The previous implementation only worked in T3 10.4
extrameile · May 8, 2023 · 28d595c · 28d595c
1 parent b850187
commit 28d595c
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/Classes/Hooks/FormElementsOnSubmitHooks.php b/Classes/Hooks/FormElementsOnSubmitHooks.php
@@ -5,6 +5,7 @@
 namespace Extrameile\FormDynamicRecipient\Hooks;
 
 use Extrameile\FormDynamicRecipient\Domain\Model\Recipient;
+use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Form\Domain\Model\Renderable\RenderableInterface;
@@ -69,17 +70,25 @@ private function getRecipient($uid)
 
         if ($row) {
             $GLOBALS['TSFE']->sys_page->versionOL(Recipient::TABLE, $row, true);
+
             // Language overlay:
-            if (\is_array($row) && $GLOBALS['TSFE']->sys_language_contentOL) {
-                $row = $GLOBALS['TSFE']->sys_page->getRecordOverlay(
+            $languageAspect = GeneralUtility::makeInstance(Context::class)->getAspect('language');
+            if (is_array($row) && $languageAspect->getContentId() > 0) {
+                $row = $this->getTsfe()->sys_page->getLanguageOverlay(
                     Recipient::TABLE,
-                    $row,
-                    $GLOBALS['TSFE']->sys_language_content,
-                    $GLOBALS['TSFE']->sys_language_contentOL
+                    $row
                 );
             }
         }
 
         return $row;
     }
+
+    /**
+     * @return \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController
+     */
+    private function getTsfe()
+    {
+        return $GLOBALS['TSFE'];
+    }
 }