From d3a79c87245bff5227e3486c7e75bbf203b43489 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 23 Feb 2015 14:44:24 +0100
Subject: [PATCH] Fix default entity guess

---
 htdocs/user/card.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 429bcc91130..ec6b65e534c 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2005      Lionel Cousteix      <etm_ltd@tiscali.co.uk>
@@ -213,25 +213,25 @@ if ($action == 'add' && $canadduser)
         $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
 
         // If multicompany is off, admin users must all be on entity 0.
+        $entity=GETPOST('entity','int');
         if (! empty($conf->multicompany->enabled))
         {
-        	$entity=GETPOST('entity','int');
         	if (! empty($_POST["superadmin"]))
         	{
         		$object->entity = 0;
         	}
         	else if ($conf->multicompany->transverse_mode)
         	{
-        		$object->entity = 1; // all users in master entity
+        		$object->entity = 1; // all users are forced into master entity
         	}
         	else
         	{
-        		$object->entity = (empty($entity) ? 0 : $entity);
+        		$object->entity = ($entity == '' ? 1 : $entity);
         	}
         }
         else
         {
-        	$object->entity = (empty($entity) ? 0 : $entity);
+        	$object->entity = ($entity == '' ? 1 : $entity);
         }
 
         $db->begin();