⏫ Forwardport of #12515 to 2.3-develop branch

Applied pull request patch https://github.com/magento/magento2/pull/12515.patch (created by @lfluvisotto) based on commit(s): 1. fe9221f 2. a3ed399
magento · Jan 24, 2018 · 1623007 · 1623007
1 parent 8e77e2f
commit 1623007
Showing 1 changed file with 1 addition and 5 deletions.
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();
     }
 
     /**