Ensure the domain detection only returns the locale if it is unambiguous

tractorcow-farm · May 15, 2020 · 6182ea0 · 6182ea0
1 parent 7bd139c
commit 6182ea0
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Middleware/DetectLocaleMiddleware.php b/src/Middleware/DetectLocaleMiddleware.php
@@ -283,10 +283,12 @@ protected function getDomainLocale()
 
         // If the current domain has exactly one locale, the locale is non-ambiguous
         $locales = Locale::getCached()->filter('DomainID', $domainObj->ID);
-        /** @var Locale $localeObject */
-        $localeObject = $locales->first();
-        if ($localeObject) {
-            return $localeObject->getLocale();
+        if ($locales->count() == 1) {
+            /** @var Locale $localeObject */
+            $localeObject = $locales->first();
+            if ($localeObject) {
+                return $localeObject->getLocale();
+            }
         }
 
         return null;