Merge 3.x into master

sonata-project · Dec 18, 2019 · 1be2328 · 1be2328
2 parents cd212ba + 43a2ba4
commit 1be2328
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/CustomerBundle/Controller/CustomerController.php b/src/CustomerBundle/Controller/CustomerController.php
@@ -144,7 +144,7 @@ public function setCurrentAddressAction($id)
      */
     protected function updateAddress($id = null)
     {
-        $request = $this->getCurrentRequest();
+        $request = $this->get('request_stack')->getCurrentRequest();
         $customer = $this->getCustomer();
 
         // Show address creation/edition form