IBX-8562: Fixed flooding content attributes table with duplicates

Author: Nattfarinn

eZ/Publish/Core/Persistence/Legacy/Content/Handler.php

@@ -320,7 +320,9 @@ public function load($id, $version = null, array $translations = null)
             $this->contentGateway->loadVersionedNameData([[
                 'id' => $id,
                 'version' => $rows[0]['ezcontentobject_version_version'],
-            ]])
+            ]]),
+            'ezcontentobject_',
+            $translations
         );
         $content = $contentObjects[0];
         unset($rows, $contentObjects);
@@ -371,7 +373,9 @@ public function loadContentList(array $contentIds, array $translations = null):
             try {
                 $contentList = $this->mapper->extractContentFromRows(
                     $contentItemsRow,
-                    $contentItemNameData[$contentId]
+                    $contentItemNameData[$contentId],
+                    'ezcontentobject_',
+                    $translations
                 );
                 $contentItems[$contentId] = $contentList[0];
             } catch (Exception $e) {

eZ/Publish/Core/Persistence/Legacy/Content/Mapper.php

@@ -220,6 +220,7 @@ public function convertToStorageValue(Field $field)
      * @param array<array<string, scalar>> $rows
      * @param array<array<string, scalar>> $nameRows
      * @param string $prefix
+     * @param array<string>|null $translations
      *
      * @return \eZ\Publish\SPI\Persistence\Content[]
      *
@@ -228,7 +229,8 @@ public function convertToStorageValue(Field $field)
     public function extractContentFromRows(
         array $rows,
         array $nameRows,
-        string $prefix = 'ezcontentobject_'
+        string $prefix = 'ezcontentobject_',
+        ?array $translations = null
     ): array {
         $versionedNameData = [];
 
@@ -245,7 +247,8 @@ public function extractContentFromRows(
 
         $fieldDefinitions = $this->loadCachedVersionFieldDefinitionsPerLanguage(
             $rows,
-            $prefix
+            $prefix,
+            $translations
         );
 
         foreach ($rows as $row) {
@@ -348,7 +351,8 @@ private function buildContentObjects(
      */
     private function loadCachedVersionFieldDefinitionsPerLanguage(
         array $rows,
-        string $prefix
+        string $prefix,
+        ?array $translations = null
     ): array {
         $fieldDefinitions = [];
         $contentTypes = [];
@@ -364,7 +368,8 @@ private function loadCachedVersionFieldDefinitionsPerLanguage(
                 continue;
             }
 
-            $languageCodes = $this->extractLanguageCodesFromMask($languageMask, $allLanguages);
+            $allLanguagesCodes = $this->extractLanguageCodesFromMask($languageMask, $allLanguages);
+            $languageCodes = empty($translations) ? $allLanguagesCodes : array_intersect($translations, $allLanguagesCodes);
             $contentTypes[$contentTypeId] = $contentTypes[$contentTypeId] ?? $this->contentTypeHandler->load($contentTypeId);
             $contentType = $contentTypes[$contentTypeId];
             foreach ($contentType->fieldDefinitions as $fieldDefinition) {