From ea310efba50308f657dfe80d2148c2bdba10dd08 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 2 Jul 2014 19:57:18 +0200
Subject: [PATCH] Fix: [ bug #1471 ] Several PHP warnings when intercepting
 USER_CREATE trigger

---
 ChangeLog             | 1 +
 htdocs/user/fiche.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c908243a5fb..df3198a7bf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,6 +68,7 @@ For users:
 - Fix: [ bug #1478 ] BILL_PAYED trigger action does not intercept failure under some circumstances
 - Fix: [ bug #1479 ] Several customer invoice triggers do not intercept trigger action
 - Fix: [ bug #1477 ] Several customer invoice triggers do not show trigger error messages
+- Fix: [ bug #1471 ] Several PHP warnings when intercepting USER_CREATE trigger.
 
 TODO
 - New: Predefined product and free product use same form.
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index f71cd7565fb..13f890c6013 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -238,8 +238,8 @@ if ($action == 'add' && $canadduser)
         {
             $langs->load("errors");
             $db->rollback();
-            if (is_array($object->errors) && count($object->errors)) $message='<div class="error">'.join('<br>',$langs->trans($object->errors)).'</div>';
-            else $message='<div class="error">'.$langs->trans($object->error).'</div>';
+            if (is_array($object->errors) && count($object->errors)) setEventMessage($object->errors,'errors');
+            else setEventMessage($object->error);
             $action="create";       // Go back to create page
         }
 
-- 
GitLab