Merge branch 'develop'

pierrestoffe · Nov 18, 2020 · 0d7bd3d · 0d7bd3d
2 parents 394d918 + 205eeea
commit 0d7bd3d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/.craftplugin b/.craftplugin
@@ -1 +1 @@
-{"pluginName":"Locale Redirector","pluginDescription":"Automatically redirect visitors to their preferred language","pluginVersion":"1.5.1","pluginAuthorName":"Pierre Stoffe","pluginVendorName":"pierrestoffe","pluginAuthorUrl":"https://pierrestoffe.be","pluginAuthorGithub":"pierrestoffe","codeComments":"yes","pluginComponents":["services"],"consolecommandName":"","controllerName":"","cpsectionName":"","elementName":"","fieldName":"","modelName":"","purchasableName":"","recordName":"","serviceName":"","taskName":"","utilityName":"","widgetName":"","apiVersion":"api_version_3_0"}
+{"pluginName":"Locale Redirector","pluginDescription":"Automatically redirect visitors to their preferred language","pluginVersion":"1.5.2","pluginAuthorName":"Pierre Stoffe","pluginVendorName":"pierrestoffe","pluginAuthorUrl":"https://pierrestoffe.be","pluginAuthorGithub":"pierrestoffe","codeComments":"yes","pluginComponents":["services"],"consolecommandName":"","controllerName":"","cpsectionName":"","elementName":"","fieldName":"","modelName":"","purchasableName":"","recordName":"","serviceName":"","taskName":"","utilityName":"","widgetName":"","apiVersion":"api_version_3_0"}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 
+## [1.5.2] - 2020-11-18
+
+### Fixed
+- Fixed edge case of $defaultEntryId, when an entry exists in a Site but is disabled
+
 ## [1.5.1] - 2020-11-06
 
 ### Fixed

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "pierrestoffe/craft-language-redirector",
     "description": "Automatically redirect visitors to their preferred language",
     "type": "craft-plugin",
-    "version": "1.5.1",
+    "version": "1.5.2",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/services/LanguageRedirectorService.php b/src/services/LanguageRedirectorService.php
@@ -199,20 +199,16 @@ public function getTargetElement(string $language = null, string $group = null)
             return null;
         }
 
+        $targetElementFound = true;
         $targetElement = Craft::$app->elements->getElementById($currentElement->getId(), null, $targetSite->id);
 
-        if (null === $targetElement && null !== $defaultEntryId) {
-            $defaultElement = Craft::$app->elements->getElementById($defaultEntryId, null, $targetSite->id);
-            $targetElement = $defaultElement;
-        }
-
-        if (null === $targetElement) {
-            return null;
+        // If element is not enabled for this site
+        if (null === $targetElement || (false == $targetElement->enabledForSite && null === $this->_getLanguageFromQueryParameter())) {
+            $targetElementFound = false;
         }
 
-        // If element is not enabled for this site
-        if (false == $targetElement->enabledForSite && null === $this->_getLanguageFromQueryParameter()) {
-            return null;
+        if (false === $targetElementFound && null !== $defaultEntryId) {
+            $targetElement = Craft::$app->elements->getElementById($defaultEntryId, null, $targetSite->id);
         }
 
         return $targetElement;

diff --git a/src/variables/LanguageSwitcherVariable.php b/src/variables/LanguageSwitcherVariable.php
@@ -26,6 +26,7 @@ class LanguageSwitcherVariable
      * Get the URLs of all languages.
      *
      * @param array|null $urlOverrides
+     * @param string $group
      *
      * @return array
      */