Merge forwardport of #12515 to 2.3-develop branch

magento-engcom-team · web-flow · commit bdb62bb6c6c8 · 2018-01-24T21:23:02.000+03:00
Applied pull request patch https://github.com/magento/magento2/pull/12515.patch (created by @lfluvisotto) based on commit(s): 1. fe9221f 2. a3ed399
diff --git a/app/code/Magento/Variable/Block/System/Variable/Edit.php b/app/code/Magento/Variable/Block/System/Variable/Edit.php
@@ -90,11 +90,7 @@ protected function _preparelayout()
      */
     public function getFormHtml()
     {
-        $formHtml = parent::getFormHtml();
-        if (!$this->_storeManager->isSingleStoreMode() && $this->getVariable()->getId()) {
-            $formHtml = $formHtml;
-        }
-        return $formHtml;
+        return parent::getFormHtml();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -90,11 +90,7 @@ protected function _preparelayout()`
`90`	`90`	`*/`
`91`	`91`	`public function getFormHtml()`
`92`	`92`	`{`
`93`		`- $formHtml = parent::getFormHtml();`
`94`		`- if (!$this->_storeManager->isSingleStoreMode() && $this->getVariable()->getId()) {`
`95`		`- $formHtml = $formHtml;`
`96`		`- }`
`97`		`- return $formHtml;`
	`93`	`+ return parent::getFormHtml();`
`98`	`94`	`}`
`99`	`95`
`100`	`96`	`/**`