Merge pull request PrestaShop#7796 from maximebiloe/fix-address-ajax-…

…refresh Fix address form Ajax refresh
Leoche · Apr 18, 2017 · f9093a1 · f9093a1
2 parents bb7877e + 537c099
commit f9093a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/controllers/front/AddressController.php b/controllers/front/AddressController.php
@@ -122,8 +122,8 @@ public function displayAjaxAddressForm()
     {
         $addressForm = $this->makeAddressForm();
 
-        if (Tools::getIsset('id_address')) {
-            $addressForm->loadAddressById(Tools::getValue('id_address'));
+        if (Tools::getIsset('id_address') && ($id_address = (int)Tools::getValue('id_address'))) {
+            $addressForm->loadAddressById($id_address);
         }
 
         if (Tools::getIsset('id_country')) {

diff --git a/controllers/front/OrderController.php b/controllers/front/OrderController.php
@@ -235,8 +235,8 @@ public function displayAjaxAddressForm()
     {
         $addressForm = $this->makeAddressForm();
 
-        if (Tools::getIsset('id_address')) {
-            $addressForm->loadAddressById(Tools::getValue('id_address'));
+        if (Tools::getIsset('id_address') && ($id_address = (int)Tools::getValue('id_address'))) {
+            $addressForm->loadAddressById($id_address);
         }
 
         if (Tools::getIsset('id_country')) {