EZP-31026: Fixed resolving of lang params in SA loadContentListByCont…

…entInfo (#2816) Fixed resolving of language parameters in the `SiteAccessAware\ContentService::loadContentListByContentInfo` method.
ezsystems · Oct 11, 2019 · 50d956c · 50d956c
1 parent 40a840a
commit 50d956c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/eZ/Publish/Core/Repository/SiteAccessAware/ContentService.php b/eZ/Publish/Core/Repository/SiteAccessAware/ContentService.php
@@ -222,9 +222,13 @@ public function deleteTranslationFromDraft(VersionInfo $versionInfo, $languageCo
         return $this->service->deleteTranslationFromDraft($versionInfo, $languageCode);
     }
 
-    public function loadContentListByContentInfo(array $contentInfoList, array $languages = [], $useAlwaysAvailable = true)
+    public function loadContentListByContentInfo(array $contentInfoList, array $languages = null, $useAlwaysAvailable = null)
     {
-        return $this->service->loadContentListByContentInfo($contentInfoList, $languages, $useAlwaysAvailable);
+        return $this->service->loadContentListByContentInfo(
+            $contentInfoList,
+            $this->languageResolver->getPrioritizedLanguages($languages),
+            $this->languageResolver->getUseAlwaysAvailable($useAlwaysAvailable)
+        );
     }
 
     public function hideContent(ContentInfo $contentInfo): void

diff --git a/eZ/Publish/Core/Repository/SiteAccessAware/Tests/ContentServiceTest.php b/eZ/Publish/Core/Repository/SiteAccessAware/Tests/ContentServiceTest.php
@@ -123,6 +123,9 @@ public function providerForLanguagesLookupMethods()
 
             ['loadContentByRemoteId', ['f348tj4gorgji4'], true, 1],
             ['loadContentByRemoteId', ['f348tj4gorgji4', self::LANG_ARG, 4, false], true, 1],
+
+            ['loadContentListByContentInfo', [[$contentInfo]], [], 1],
+            ['loadContentListByContentInfo', [[$contentInfo], self::LANG_ARG, false], [], 1],
         ];
     }
 }