From 63b8835885e3abebd8af584961af9c5c82a47152 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Sun, 23 Jul 2017 11:42:18 +0200
Subject: [PATCH 1/2] Fix: remove unused $_COOKIE['DOLENTITY']

---
 htdocs/master.inc.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index fc1c41895a4..a8d068cfd7d 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -160,10 +160,6 @@ else if (defined('DOLENTITY') && is_numeric(DOLENTITY))			// For public page wit
 {
 	$conf->entity = DOLENTITY;
 }
-else if (!empty($_COOKIE['DOLENTITY']))						    // For other application with MultiCompany module (TODO: We should remove this. entity to use should never be stored into client side)
-{
-	$conf->entity = $_COOKIE['DOLENTITY'];
-}
 
 // Sanitize entity
 if (! is_numeric($conf->entity)) $conf->entity=1;

From c934f1bd13cce511ce8013ad8a717cb5140fad63 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Sun, 23 Jul 2017 12:07:20 +0200
Subject: [PATCH 2/2] Fix: remove unused old code

---
 htdocs/user/logout.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/htdocs/user/logout.php b/htdocs/user/logout.php
index 37ff691fdcc..4421c6d6298 100644
--- a/htdocs/user/logout.php
+++ b/htdocs/user/logout.php
@@ -50,13 +50,6 @@ if ($result < 0) { $error++; }
 // Define url to go after disconnect
 $urlfrom=empty($_SESSION["urlfrom"])?'':$_SESSION["urlfrom"];
 
-// Destroy some cookies
-// TODO external module
-if (! empty($conf->phenix->enabled) && ! empty($conf->phenix->cookie))
-{
-	setcookie($conf->phenix->cookie, '', 1, "/");
-}
-
 // Define url to go
 $url=DOL_URL_ROOT."/index.php";		// By default go to login page
 if ($urlfrom) $url=DOL_URL_ROOT.$urlfrom;