Merge pull request #17147 to #17133

magento-engcom-team · magento-engcom-team · commit e0dc00eca810 · 2018-07-26T01:31:51.000-05:00
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
@@ -102,7 +102,7 @@ public function getElementHtml()
      */
     public function getImages()
     {
-        return $this->registry->registry('current_product')->getData('media_gallery') ?: null;
+        return $this->getDataObject()->getData('media_gallery') ?: null;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public function getElementHtml()`
`102`	`102`	`*/`
`103`	`103`	`public function getImages()`
`104`	`104`	`{`
`105`		`- return $this->registry->registry('current_product')->getData('media_gallery') ?: null;`
	`105`	`+ return $this->getDataObject()->getData('media_gallery') ?: null;`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`/**`