Merge pull request #16 from 80Quattro/bugfix_preview_mode

[BUGFIX] Configuration - Request in ext:Form Preview Mode
studiomitte · Apr 2, 2024 · d6573ca · d6573ca
2 parents 17c555b + f51826c
commit d6573ca
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/Classes/Configuration.php b/Classes/Configuration.php
@@ -5,6 +5,7 @@
 namespace StudioMitte\FriendlyCaptcha;
 
 use TYPO3\CMS\Core\Core\Environment;
+use TYPO3\CMS\Core\Site\Entity\NullSite;
 use TYPO3\CMS\Core\Site\Entity\Site;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
@@ -24,7 +25,7 @@ public function __construct(Site $site = null)
         if ($site === null) {
             $site = $GLOBALS['TYPO3_REQUEST']->getAttribute('site');
         }
-        if ($site === null) {
+        if ($site === null || $site instanceof NullSite) {
             return;
         }
         $siteConfiguration = $site->getConfiguration();

diff --git a/Classes/ViewHelpers/ConfigurationViewHelper.php b/Classes/ViewHelpers/ConfigurationViewHelper.php
@@ -29,9 +29,13 @@ public static function renderStatic(array $arguments, \Closure $renderChildrenCl
 
     protected static function getLanguageIsoCode(): string
     {
+        $language = $GLOBALS['TYPO3_REQUEST']->getAttribute('language');
+        if(!$language) {
+            return '';
+        }
         if ((new Typo3Version())->getMajorVersion() >= 12) {
-            return $GLOBALS['TYPO3_REQUEST']->getAttribute('language')->getLocale()->getLanguageCode();
+            return $language->getLocale()->getLanguageCode();
         }
-        return $GLOBALS['TYPO3_REQUEST']->getAttribute('language')->getTwoLetterIsoCode();
+        return $language->getTwoLetterIsoCode();
     }
 }
diff --git a/ext_emconf.php b/ext_emconf.php
@@ -17,5 +17,5 @@
         ],
     ],
     'state' => 'beta',
-    'version' => '0.1.2',
+    'version' => '0.1.3',
 ];