ENGCOM-5863: Resolved select from gallery option not working in theme design configuration #24430 #24431

Author: sidolov

app/code/Magento/Theme/Model/Design/Backend/File.php

@@ -247,7 +247,7 @@ private function getMime()
      */
     private function getRelativeMediaPath(string $path): string
     {
-        return preg_replace('/\/(pub\/)?media\//', '', $path);
+        return preg_split('/\/(pub\/)?media\//', $path)[1] ?? preg_replace('/\/(pub\/)?media\//', '', $path);
     }
 
     /**

app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php

@@ -282,4 +282,35 @@ public function testBeforeSaveWithExistingFile()
             $this->fileBackend->getValue()
         );
     }
+
+    /**
+     * Test for getRelativeMediaPath method.
+     *
+     * @param string $path
+     * @param string $filename
+     * @dataProvider getRelativeMediaPathDataProvider
+     */
+    public function testGetRelativeMediaPath(string $path, string $filename)
+    {
+        $reflection = new \ReflectionClass($this->fileBackend);
+        $method = $reflection->getMethod('getRelativeMediaPath');
+        $method->setAccessible(true);
+        $this->assertEquals(
+            $filename,
+            $method->invoke($this->fileBackend, $path . $filename)
+        );
+    }
+
+    /**
+     * Data provider for testGetRelativeMediaPath.
+     *
+     * @return array
+     */
+    public function getRelativeMediaPathDataProvider(): array
+    {
+        return [
+            'Normal path' => ['pub/media/', 'filename.jpg'],
+            'Complex path' => ['somepath/pub/media/', 'filename.jpg'],
+        ];
+    }
 }