From 59a1105fce2bb4be1541ac8ee66bafdfeff6a01c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Fri, 25 Oct 2013 14:55:27 +0200
Subject: [PATCH] // small fix on multishop checkboxes

---
 cache/class_index.php | 6 +++++-
 js/admin.js           | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/cache/class_index.php b/cache/class_index.php
index 767ee17c2..c4c6a95d1 100644
--- a/cache/class_index.php
+++ b/cache/class_index.php
@@ -242,7 +242,7 @@
   'CarrierCore' => 'classes/Carrier.php',
   'CarrierModule' => '',
   'CarrierModuleCore' => 'classes/module/CarrierModule.php',
-  'Cart' => '',
+  'Cart' => 'override/classes/Cart.php',
   'CartController' => '',
   'CartControllerCore' => 'controllers/front/CartController.php',
   'CartCore' => 'classes/Cart.php',
@@ -378,6 +378,8 @@
   'HelperTreeCategoriesCore' => 'classes/helper/HelperTreeCategories.php',
   'HelperTreeShops' => '',
   'HelperTreeShopsCore' => 'classes/helper/HelperTreeShops.php',
+  'HelperUploader' => '',
+  'HelperUploaderCore' => 'classes/helper/HelperUploader.php',
   'HelperView' => '',
   'HelperViewCore' => 'classes/helper/HelperView.php',
   'HistoryController' => '',
@@ -644,6 +646,8 @@
   'TreeToolbarSearchCore' => 'classes/tree/TreeToolbarSearch.php',
   'Upgrader' => '',
   'UpgraderCore' => 'classes/Upgrader.php',
+  'Uploader' => '',
+  'UploaderCore' => 'classes/Uploader.php',
   'Validate' => '',
   'ValidateCore' => 'classes/Validate.php',
   'Warehouse' => '',
diff --git a/js/admin.js b/js/admin.js
index d71935cbe..4a05afa85 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -708,6 +708,7 @@ function checkMultishopDefaultValue(obj, key)
 	{
 		$('#conf_id_'+key+' input, #conf_id_'+key+' textarea, #conf_id_'+key+' select').attr('disabled', true);
 		$('#conf_id_'+key+' label.conf_title').addClass('isDisabled');
+		$(obj).attr('disabled', false);
 	}
 	else
 	{