Merge pull request #17 from bitmotionAE/TYPO3_8

[BUGFIX] Fix handling of rules for language uid 0 when target page is current page
Leuchtfeuer · Sep 11, 2019 · c997d03 · c997d03
2 parents ffbee55 + 5a68c24
commit c997d03
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Classes/Action/Redirect.php b/Classes/Action/Redirect.php
@@ -197,7 +197,7 @@ private function shouldRedirect(int $sysLanguageUid): bool
      */
     private function redirectToPid(string $target, string $language, int $httpResponseCode)
     {
-        if ($language) {
+        if (is_numeric($language)) {
             $languageId = (int)$language;
             $urlParameters = ['L' => intval($language)];
         } else {
@@ -211,7 +211,7 @@ private function redirectToPid(string $target, string $language, int $httpRespon
         if ($targetPageUid) {
             if ($targetPageUid == $GLOBALS['TSFE']->id) {
                 // Legacy (only TYPO3 8)
-                if ($urlParameters['L']) {
+                if (isset($urlParameters['L']) && is_numeric($urlParameters['L'])) {
 
                     if ($this->requestedLanguageUid == $urlParameters['L']) {
                         return;