From f49a1940e5fe3e39936acbb7669b778b36ffc424 Mon Sep 17 00:00:00 2001
From: rGaillard <remi.gaillard@prestashop.com>
Date: Fri, 10 Feb 2012 13:39:55 +0000
Subject: [PATCH] // Re-add multishop association on contacts

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13225 b9a71923-0436-4b27-9f14-aed3839534dd
---
 controllers/admin/AdminContactsController.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/controllers/admin/AdminContactsController.php b/controllers/admin/AdminContactsController.php
index 78ae619b1..22694c134 100644
--- a/controllers/admin/AdminContactsController.php
+++ b/controllers/admin/AdminContactsController.php
@@ -108,6 +108,16 @@ class AdminContactsControllerCore extends AdminController
 				'class' => 'button'
 			)
 		);
+		
+		if (Shop::isFeatureActive())
+		{
+			$this->fields_form['input'][] = array(
+				'type' => 'shop',
+				'label' => $this->l('Shop association:'),
+				'name' => 'checkBoxShopAsso',
+				'values' => Shop::getTree()
+			);
+		}
 
 		return parent::renderForm();
 	}