Skip to content

Commit

Permalink
Merge pull request #7186 in SW/shopware from ntr/5.5/fix-product-feed…
Browse files Browse the repository at this point in the history
… to 5.5

* commit '2039aed4e862c7e4bd5b3ded2d6a2d2d4e48d24c':
  NTR - Fix product feed saving
  • Loading branch information
soebbing committed Nov 30, 2018
2 parents a21bf61 + 2039aed commit 312dd6b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion engine/Shopware/Models/ProductFeed/ProductFeed.php
Original file line number Diff line number Diff line change
Expand Up @@ -1143,7 +1143,7 @@ public function sanitizeFilename()
$this->fileName = basename($this->fileName);
$extension = strtolower(pathinfo($this->fileName, PATHINFO_EXTENSION));

if (in_array($extension, \Shopware_Controllers_Backend_MediaManager::$fileUploadBlacklist, true)) {
if (!empty($extension) && in_array($extension, \Shopware_Controllers_Backend_MediaManager::$fileUploadBlacklist, true)) {
$this->fileName = str_replace('.' . $extension, '.invalid', strtolower($this->fileName));

// To prevent PrePersist event
Expand Down

0 comments on commit 312dd6b

Please sign in to comment.