From 8cb2cb0429ac76a0ae52b186ee75987eb0c775b3 Mon Sep 17 00:00:00 2001 From: EchoLoGeek <73399671+EchoLoGeek@users.noreply.github.com> Date: Fri, 25 Nov 2022 22:34:53 +0100 Subject: [PATCH 1/4] Update card.php --- htdocs/user/card.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 7fc268568c8..7f8959975f6 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -537,6 +537,9 @@ if (empty($reshook)) { $sql .= " SET fk_socpeople=".((int) $contactid); if (!empty($contact->socid)) { $sql .= ", fk_soc=".((int) $contact->socid); + } elseif($socid > 0){ + $sql .= ", fk_soc=''"; + setEventMessages($langs->trans("WarningUserDifferentContactSocid"),'','warnings'); // Add message if post socid != $contact->socid } $sql .= " WHERE rowid = ".((int) $object->id); } elseif ($socid > 0) { From 3b9122bada73ea92de795279c802640426bc0a04 Mon Sep 17 00:00:00 2001 From: EchoLoGeek <73399671+EchoLoGeek@users.noreply.github.com> Date: Fri, 25 Nov 2022 22:37:13 +0100 Subject: [PATCH 2/4] Update main.lang --- htdocs/langs/fr_FR/main.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 37bd9224798..211c841ee4e 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -1207,3 +1207,4 @@ CreatedByPublicPortal=Créé à partir du portail public UserAgent=User Agent InternalUser=Utilisateur interne ExternalUser=Utilisateur externe +WarningUserDifferentContactSocid=Contact non relié à un tiers. Le tiers ne sera pas enregistré. From 9f5a046e10e9a8def4469ada4e046cd85dc760d3 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Fri, 25 Nov 2022 21:46:25 +0000 Subject: [PATCH 3/4] Fixing style errors. --- 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 7f8959975f6..d71922cbfd5 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -537,9 +537,9 @@ if (empty($reshook)) { $sql .= " SET fk_socpeople=".((int) $contactid); if (!empty($contact->socid)) { $sql .= ", fk_soc=".((int) $contact->socid); - } elseif($socid > 0){ + } elseif ($socid > 0) { $sql .= ", fk_soc=''"; - setEventMessages($langs->trans("WarningUserDifferentContactSocid"),'','warnings'); // Add message if post socid != $contact->socid + setEventMessages($langs->trans("WarningUserDifferentContactSocid"), '', 'warnings'); // Add message if post socid != $contact->socid } $sql .= " WHERE rowid = ".((int) $object->id); } elseif ($socid > 0) { From 4b7157e82ab2be05e3203eaf2d0397e692aedff6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 26 Nov 2022 00:10:15 +0100 Subject: [PATCH 4/4] Update card.php --- htdocs/user/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/user/card.php b/htdocs/user/card.php index d71922cbfd5..2325ab7ab53 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -538,7 +538,7 @@ if (empty($reshook)) { if (!empty($contact->socid)) { $sql .= ", fk_soc=".((int) $contact->socid); } elseif ($socid > 0) { - $sql .= ", fk_soc=''"; + $sql .= ", fk_soc = null"; setEventMessages($langs->trans("WarningUserDifferentContactSocid"), '', 'warnings'); // Add message if post socid != $contact->socid } $sql .= " WHERE rowid = ".((int) $object->id);