Skip to content

Commit a0c1786

Browse files
authored
ENGCOM-7486: Correct used in sections image pattern, minor fixes #27966
2 parents 4a8f99d + 43423bf commit a0c1786

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

app/code/Magento/MediaContent/Model/GetContentByAssetIds.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public function execute(array $assetIds): array
7070
->where(self::ASSET_ID . ' IN (?)', $assetIds);
7171

7272
$contentIdentities = [];
73-
foreach ($connection->fetchAssoc($select) as $contentIdentityData) {
73+
foreach ($connection->fetchAll($select) as $contentIdentityData) {
7474
$contentIdentities[] = $this->factory->create($contentIdentityData);
7575
}
7676
return $contentIdentities;

app/code/Magento/MediaContentCatalog/etc/media_content.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<search>
1010
<patterns>
1111
<pattern name="catalog_image">/^\/?media\/(.*)/</pattern>
12+
<pattern name="catalog_image_with_pub">/^\/pub\/?media\/(.*)/</pattern>
1213
</patterns>
1314
</search>
14-
</config>
15+
</config>

dev/tests/integration/testsuite/Magento/MediaContent/Model/ExtractAssetsFromContentTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,12 @@ public function contentProvider()
8383
2020
8484
]
8585
],
86+
'Relevant path content with pub' => [
87+
'/pub/media/testDirectory/path.jpg',
88+
[
89+
2020
90+
]
91+
],
8692
'Relevant path content' => [
8793
'/media/testDirectory/path.jpg',
8894
[

0 commit comments

Comments
 (0)