IBX-6260: Fixed preview voter taking language priority into considera…

…tion (#865)
ezsystems · Aug 21, 2023 · 4523e6b · 4523e6b
1 parent 3df4f90
commit 4523e6b
Showing 1 changed file with 6 additions and 19 deletions.
diff --git a/src/lib/Siteaccess/AbstractSiteaccessPreviewVoter.php b/src/lib/Siteaccess/AbstractSiteaccessPreviewVoter.php
@@ -32,38 +32,25 @@ public function __construct(
      */
     public function vote(SiteaccessPreviewVoterContext $context): bool
     {
-        $siteaccess = $context->getSiteaccess();
+        $siteAccess = $context->getSiteaccess();
         $location = $context->getLocation();
         $languageCode = $context->getLanguageCode();
-        $contentLanguages = $context->getVersionInfo()->languageCodes;
 
-        if (empty(array_intersect($this->getRootLocationIds($siteaccess), $location->path))) {
+        if (empty(array_intersect($this->getRootLocationIds($siteAccess), $location->path))) {
             return false;
         }
 
-        if (!$this->validateRepositoryMatch($siteaccess)) {
+        if (!$this->validateRepositoryMatch($siteAccess)) {
             return false;
         }
 
-        $siteaccessLanguages = $this->configResolver->getParameter(
+        $siteAccessLanguages = $this->configResolver->getParameter(
             'languages',
             null,
-            $siteaccess
+            $siteAccess
         );
 
-        if (!in_array($languageCode, $siteaccessLanguages, true)) {
-            return false;
-        }
-
-        $primarySiteaccessLanguage = reset($siteaccessLanguages);
-        if (
-            $languageCode !== $primarySiteaccessLanguage
-            && in_array($primarySiteaccessLanguage, $contentLanguages)
-        ) {
-            return false;
-        }
-
-        return true;
+        return in_array($languageCode, $siteAccessLanguages, true);
     }
 
     protected function validateRepositoryMatch(string $siteaccess): bool