ENGCOM-4800: Error on design configuration save with imageUploader form element po… #22132

sivaschenko · web-flow · commit dcccadcba485 · 2019-04-28T23:50:05.000+01:00
diff --git a/app/code/Magento/Theme/Model/Design/Backend/File.php b/app/code/Magento/Theme/Model/Design/Backend/File.php
@@ -235,7 +235,7 @@ private function getMime()
      */
     private function getRelativeMediaPath(string $path): string
     {
-        return str_replace('/pub/media/', '', $path);
+        return preg_replace('/\/(pub\/)?media\//', '', $path);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ private function getMime()`
`235`	`235`	`*/`
`236`	`236`	`private function getRelativeMediaPath(string $path): string`
`237`	`237`	`{`
`238`		`- return str_replace('/pub/media/', '', $path);`
	`238`	`+ return preg_replace('/\/(pub\/)?media\//', '', $path);`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`/**`