From d0ab117488163894396aa0b9e95cebce50fa7a8b Mon Sep 17 00:00:00 2001
From: jfefe <jfefe@users.noreply.github.com>
Date: Tue, 28 Nov 2017 15:06:23 +0100
Subject: [PATCH 1/2] FIX : external user cannot be set as internal

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

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 846c9dffc9a..47ec64931d4 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2012      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
  * Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
- * Copyright (C) 2015      Jean-François Ferry  <jfefe@aternatik.fr>
+ * Copyright (C) 2015-2017 Jean-François Ferry  <jfefe@aternatik.fr>
  * Copyright (C) 2015      Ari Elbaz (elarifr)  <github@accedinfo.com>
  * Copyright (C) 2015      Charlie Benke        <charlie@patas-monkey.com>
  * Copyright (C) 2016      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
@@ -415,8 +415,8 @@ if (empty($reshook)) {
 					}
 				}
 
-				if (!$error && GETPOST('contactid', 'int')) {
-					$contactid = GETPOST('contactid', 'int');
+				$contactid = GETPOST('contactid', 'int');
+				if (!$error && $contactid >= 0) {
 
 					if ($contactid > 0) {
 						$contact = new Contact($db);

From dbde97f25f1f120ca042cb75fa337eca83328684 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 29 Nov 2017 15:07:09 +0100
Subject: [PATCH 2/2] Update card.php

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

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 47ec64931d4..1885740b489 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -415,8 +415,8 @@ if (empty($reshook)) {
 					}
 				}
 
-				$contactid = GETPOST('contactid', 'int');
-				if (!$error && $contactid >= 0) {
+				if (!$error && GETPOSTISSET('contactid')) {
+					$contactid = GETPOST('contactid', 'int');				
 
 					if ($contactid > 0) {
 						$contact = new Contact($db);