diff --git a/Classes/Controller/TranslationController.php b/Classes/Controller/TranslationController.php index 63ea450..c74537a 100644 --- a/Classes/Controller/TranslationController.php +++ b/Classes/Controller/TranslationController.php @@ -41,7 +41,11 @@ class TranslationController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionCont $languageFactory = GeneralUtility::makeInstance( LocalizationFactory::class ); - $language = $this->request->getAttribute('language'); + if (version_compare(TYPO3_branch, '10.0', '>=')) { + $language = $this->request->getAttribute('language'); + } else { + $language = $GLOBALS['TYPO3_REQUEST']->getAttribute('language'); + } $locale = $language->getLocale(); //\TYPO3\CMS\Extbase\Utility\DebuggerUtility::var_dump( // $locale, '$locale', 3, true, false diff --git a/Classes/Utility/ApiUtility.php b/Classes/Utility/ApiUtility.php index 5fb54c8..fdc029f 100644 --- a/Classes/Utility/ApiUtility.php +++ b/Classes/Utility/ApiUtility.php @@ -17,6 +17,7 @@ use TYPO3\CMS\Core\Resource\FileReference as CoreFileReference; use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Extbase\Domain\Model\FileReference as ExtbaseFileReference; use TYPO3\CMS\Extbase\Object\ObjectManager; +use TYPO3\CMS\Extbase\Persistence\Generic\LazyLoadingProxy; use TYPO3\CMS\Extbase\Persistence\Generic\LazyObjectStorage; use TYPO3\CMS\Extbase\Persistence\ObjectStorage; use TYPO3\CMS\Extbase\Service\ImageService; @@ -76,6 +77,9 @@ class ApiUtility if (substr($method, 0, 3) === 'get') { $methodResult = call_user_func([$row, $method]); $attributeName = lcfirst(substr($method, 3)); + if (get_class($methodResult) == LazyLoadingProxy::class) { + $methodResult = $methodResult->_loadRealInstance(); + } $propertieResults[$attributeName] = $methodResult; } }