Merge pull request #128 from gigya/develop

v6.0.0
gigya · Jul 6, 2022 · b366ee3 · b366ee3
2 parents 28011bb + 5ad7d9e
commit b366ee3
Show file tree

Hide file tree

Showing 11 changed files with 1,311 additions and 1,270 deletions.
diff --git a/Block/Form/GigyaAuthenticationPopup.php b/Block/Form/GigyaAuthenticationPopup.php
@@ -31,9 +31,9 @@ class GigyaAuthenticationPopup extends AuthenticationPopup
      */
     public function __construct(
         Context $context,
+        Config $config,
         array $data = [],
-        Json $serializer = null,
-        Config $config
+        Json $serializer = null
     ) {
         $this->config = $config;
 
@@ -65,7 +65,7 @@ public function _toHtml() {
             $this->getLayout()->unsetElement('customer_form_register');
             $this->getLayout()->unsetElement('customer_edit');
         }
-        
+
         return parent::_toHtml();
     }
 }
diff --git a/Controller/Adminhtml/Customer/Index/Edit.php b/Controller/Adminhtml/Customer/Index/Edit.php
@@ -10,6 +10,7 @@
 use Magento\Customer\Api\Data\AddressInterfaceFactory;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Customer\Controller\RegistryConstants;
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\DataObjectFactory;
 use Magento\Backend\App\Action\Context;
@@ -107,7 +108,10 @@ public function __construct(
      */
     protected function initCurrentCustomer()
     {
-        $this->customerId = parent::initCurrentCustomer();
+        $this->customerId = (int)$this->getRequest()->getParam('id');
+        if ($this->customerId) {
+            $this->_coreRegistry->register(RegistryConstants::CURRENT_CUSTOMER_ID, $this->customerId);
+        }
 
         return $this->customerId;
     }