From 86f25c5374fc2fc9f02d8d903bb954d684876de9 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Fri, 7 Feb 2014 16:07:58 +0100 Subject: [PATCH] // revert historical cast to string for 1.5 template --- controllers/front/ProductController.php | 2 +- js/tools.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index 782bb8ecb1cd5..004f4f0006b21 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.php @@ -503,7 +503,7 @@ protected function assignAttributesGroups() { $attribute_list = ''; foreach ($comb['attributes'] as $id_attribute) - $attribute_list .= (int)$id_attribute.','; + $attribute_list .= '\''.(int)$id_attribute.'\','; $attribute_list = rtrim($attribute_list, ','); $combinations[$id_product_attribute]['list'] = $attribute_list; } diff --git a/js/tools.js b/js/tools.js index 89cc6ba32dcd2..b8183cd1c4899 100644 --- a/js/tools.js +++ b/js/tools.js @@ -163,7 +163,6 @@ function openCloseAllDiv(name, option) function toggleDiv(name, option) { - console.log(option); $('*[name='+name+']').each(function(){ if (option == 'open') { @@ -476,7 +475,7 @@ function print_r(arr, level) function in_array(value, array) { for (var i in array) - if (array[i] === value) + if ((array[i] + '') === (value + '')) return true; return false; }