From fd86d5bda20bf5355633cc1658814e815abf9bea Mon Sep 17 00:00:00 2001 From: mDeflotte Date: Thu, 5 Jan 2012 13:55:16 +0000 Subject: [PATCH] [-] BO : #PSFV-221 - Fixed bad ajax return on no manufacturers on the product tab --- admin-dev/ajax.php | 6 ++---- controllers/admin/AdminProductsController.php | 8 +++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/admin-dev/ajax.php b/admin-dev/ajax.php index 5cdd245c5..74ab2827d 100644 --- a/admin-dev/ajax.php +++ b/admin-dev/ajax.php @@ -75,13 +75,11 @@ if (Tools::isSubmit('ajaxProductManufacturers')) { AdminTab::$currentIndex = 'index.php?tab=AdminCatalog'; $manufacturers = Manufacturer::getManufacturers(); + $jsonArray = array(); if ($manufacturers) - { - $jsonArray = array(); foreach ($manufacturers AS $manufacturer) $jsonArray[] = '{"optionValue": "'.$manufacturer['id_manufacturer'].'", "optionDisplay": "'.htmlspecialchars(trim($manufacturer['name'])).'"}'; - die('['.implode(',', $jsonArray).']'); - } + die('['.implode(',', $jsonArray).']'); } diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 2acbf9dd5..57d5caf98 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -1949,13 +1949,11 @@ class AdminProductsControllerCore extends AdminController public function ajaxProcessProductManufacturers() { $manufacturers = Manufacturer::getManufacturers(); - if ($manufacturers) - { $jsonArray = array(); - foreach ($manufacturers AS $manufacturer) - $jsonArray[] = '{"optionValue": "'.$manufacturer['id_manufacturer'].'", "optionDisplay": "'.htmlspecialchars(trim($manufacturer['name'])).'"}'; + if ($manufacturers) + foreach ($manufacturers AS $manufacturer) + $jsonArray[] = '{"optionValue": "'.$manufacturer['id_manufacturer'].'", "optionDisplay": "'.htmlspecialchars(trim($manufacturer['name'])).'"}'; die('['.implode(',', $jsonArray).']'); - } } /**