Merge branch 'B2B-1887' of https://github.com/magento-arcticfoxes/magento2ce into B2B-1887-1889

Roman Hanin · Roman Hanin · commit 7a59dc0ca01e · 2021-07-21T12:33:37.000-05:00
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -574,7 +574,7 @@ public function uploadFile($targetPath, $type = null)
         }
 
         // create thumbnail
-        $this->resizeFile($targetPath . '/' . ltrim($uploader->getUploadedFileName(), '/'), true);
+        $this->resizeFile(rtrim($targetPath, '/') . '/' . ltrim($uploader->getUploadedFileName(), '/'), true);
 
         return $result;
     }

Original file line number	Diff line number	Diff line change
`@@ -574,7 +574,7 @@ public function uploadFile($targetPath, $type = null)`
`574`	`574`	`}`
`575`	`575`
`576`	`576`	`// create thumbnail`
`577`		`- $this->resizeFile($targetPath . '/' . ltrim($uploader->getUploadedFileName(), '/'), true);`
	`577`	`+ $this->resizeFile(rtrim($targetPath, '/') . '/' . ltrim($uploader->getUploadedFileName(), '/'), true);`
`578`	`578`
`579`	`579`	`return $result;`
`580`	`580`	`}`