MAGETWO-95140: Placeholder image does not display on Storefront products

Author: danielrenaud

app/code/Magento/Config/Model/Config.php

@@ -12,8 +12,8 @@
 
 /**
  * Backend config model
- * Used to save configuration
  *
+ * Used to save configuration
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
@@ -122,6 +122,7 @@ public function __construct(
 
     /**
      * Save config section
+     *
      * Require set: section, website, store and groups
      *
      * @throws \Exception
@@ -237,13 +238,14 @@ private function getField(string $sectionId, string $groupId, string $fieldId):
      * Get field path
      *
      * @param Field $field
+     * @param string $fieldId
      * @param array &$oldConfig Need for compatibility with _processGroup()
      * @param array &$extraOldGroups Need for compatibility with _processGroup()
      * @return string
      */
-    private function getFieldPath(Field $field, array &$oldConfig, array &$extraOldGroups): string
+    private function getFieldPath(Field $field, string $fieldId, array &$oldConfig, array &$extraOldGroups): string
     {
-        $path = $field->getGroupPath() . '/' . $field->getId();
+        $path = $field->getGroupPath() . '/' . $fieldId;
 
         /**
          * Look for custom defined field path
@@ -303,7 +305,7 @@ private function getChangedPaths(
         if (isset($groupData['fields'])) {
             foreach ($groupData['fields'] as $fieldId => $fieldData) {
                 $field = $this->getField($sectionId, $groupId, $fieldId);
-                $path = $this->getFieldPath($field, $oldConfig, $extraOldGroups);
+                $path = $this->getFieldPath($field, $fieldId, $oldConfig, $extraOldGroups);
                 if ($this->isValueChanged($oldConfig, $path, $fieldData)) {
                     $changedPaths[] = $path;
                 }
@@ -398,7 +400,7 @@ protected function _processGroup(
                 $backendModel->addData($data);
                 $this->_checkSingleStoreMode($field, $backendModel);
 
-                $path = $this->getFieldPath($field, $extraOldGroups, $oldConfig);
+                $path = $this->getFieldPath($field, $fieldId, $extraOldGroups, $oldConfig);
                 $backendModel->setPath($path)->setValue($fieldData['value']);
 
                 $inherit = !empty($fieldData['inherit']);
@@ -504,6 +506,7 @@ public function setDataByPath($path, $value)
 
     /**
      * Get scope name and scopeId
+     *
      * @todo refactor to scope resolver
      * @return void
      */