Skip to content

Commit

Permalink
Merge branch 'release/v103.0.6' into 'master'
Browse files Browse the repository at this point in the history
release/v103.0.6 into master

See merge request agence-dnd/marketplace/magento-2/external/magento2-connector-community!32
  • Loading branch information
Rémi V committed Aug 25, 2022
2 parents 7100283 + 05cce40 commit 1318206
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -366,3 +366,6 @@
* Fix product relation deletion for simple products when using differential import
* Fix default status mode when scheduled changes are used for products
* Add new dispatch events at error and success in the job executor

### Version 103.0.6 :
* Fix manually added product videos being deleted by the image attribute import
7 changes: 5 additions & 2 deletions Job/Product.php
Original file line number Diff line number Diff line change
Expand Up @@ -2367,7 +2367,7 @@ public function linkSimple()
$query = $connection->query($select);
/** @var string $edition */
$edition = $this->configHelper->getEdition();

if ($edition === Edition::SERENITY || $edition === Edition::GROWTH) {
/** @var string[] $filters */
$filters = [
Expand Down Expand Up @@ -3740,7 +3740,10 @@ public function importMedia()
}

/** @var Select $cleaner */
$cleaner = $connection->select()->from($galleryTable, ['value_id'])->where('value NOT IN (?)', $files);
$cleaner = $connection->select()
->from($galleryTable, ['value_id'])
->where('value NOT IN (?)', $files)
->where('media_type != ?', 'external-video');

$connection->delete(
$galleryEntityTable,
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"nyholm/psr7": "^1.5"
},
"type": "magento2-module",
"version": "103.0.5",
"version": "103.0.6",
"license": [
"OSL-3.0",
"AFL-3.0"
Expand Down

0 comments on commit 1318206

Please sign in to comment.