Merge branch 'master' into v1

pierrestoffe · Jul 28, 2018 · bfe1de6 · bfe1de6
2 parents 4b75389 + d5fa7b4
commit bfe1de6
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 13 deletions.
diff --git a/.craftplugin b/.craftplugin
@@ -1 +1 @@
-{"pluginName":"Locale Redirector","pluginDescription":"Automatically redirect visitors to their preferred language","pluginVersion":"1.0.6","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.0.7","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,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 
+## [1.0.7] - 2018-07-28
+
+### Changed
+- Initialize the language match only after the app is fully initialized
+
+### Fixed
+- Fixed a bug that would occur if the currently-visited entry wasn’t enable in all Sites
+
 ## [1.0.6] - 2018-07-12
 
 ### 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.0.6",
+    "version": "1.0.7",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/LanguageRedirector.php b/src/LanguageRedirector.php
@@ -46,18 +46,26 @@ public function init()
     {
         parent::init();
 
-        $request = Craft::$app->getRequest();
-        if (
-            $request->isSiteRequest &&
-            !$request->isConsoleRequest &&
-            !$request->isActionRequest &&
-            !$request->isLivePreview &&
-            !$request->isAjax
-        ) {
-            $service = new LanguageRedirectorService();
-            $service->redirectVisitor();
-        }
+        // Check for the best language match
+        Event::on(
+            CraftVariable::class,
+            CraftVariable::EVENT_INIT,
+            function (Event $event) {
+                $request = Craft::$app->getRequest();
+                if (
+                    $request->isSiteRequest &&
+                    !$request->isConsoleRequest &&
+                    !$request->isActionRequest &&
+                    !$request->isLivePreview &&
+                    !$request->isAjax
+                ) {
+                    $service = new LanguageRedirectorService();
+                    $service->redirectVisitor();
+                }
+            }
+        );
 
+        // Register the variable
         Event::on(
             CraftVariable::class,
             CraftVariable::EVENT_INIT,

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