From 6f6a292cb4dc77c638e5438b0722952739ba7c7e Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 12 Jun 2009 10:32:26 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20la=20cl=8E=20de=20cryptage=20sera=20cr?=
 =?UTF-8?q?=8E=8E=20automatiquement=20et=20sera=20donc=20obligatoire,=20ce?=
 =?UTF-8?q?ci=20permet=20aussi=20de=20ne=20pas=20tenir=20compte=20du=20coo?=
 =?UTF-8?q?kie=20si=20on=20n'utilise=20pas=20le=20module=20multi-societe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/master.inc.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index ff576f83456..d63d1cd4379 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -222,13 +222,12 @@ if (! defined('NOREQUIREDB'))
 	else
 	{
 		$entityCookieName = 'DOLENTITYID_'.md5($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"]);
-		if (isset($_COOKIE[$entityCookieName])) 						// Just for view specific login page
+		if (isset($_COOKIE[$entityCookieName]) && ! empty($conf->file->cookie_cryptkey)) 						// Just for view specific login page
 		{
 			include_once(DOL_DOCUMENT_ROOT."/core/cookie.class.php");
 
 			$lastuser = '';
 			$lastentity = '';
-			$cryptkey = ( ! empty($conf->file->cookie_cryptkey) ? $conf->file->cookie_cryptkey : '' );
 
 			$entityCookie = new DolCookie($conf->file->cookie_cryptkey);
 			$cookieValue = $entityCookie->_getCookie($entityCookieName);