Merge remote-tracking branch 'origin/3.7' into 3.8

Dolibarr · Aug 10, 2015 · e1f627c · e1f627c
2 parents c96573d + 7d18ade
commit e1f627c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
@@ -264,7 +264,7 @@
             $langs->load("errors");
             $db->rollback();
             if (is_array($object->errors) && count($object->errors)) setEventMessage($object->errors,'errors');
-            else setEventMessage($object->error);
+            else setEventMessage($object->error, 'errors');
             $action="create";       // Go back to create page
         }
 
@@ -329,7 +329,7 @@
 				$result=$tmpuser->fetch(0, GETPOST("login"));
 				if ($result > 0)
 				{
-					setEventMessage($langs->trans("ErrorLoginAlreadyExists"), 'errors');
+					setEventMessage($langs->trans("ErrorLoginAlreadyExists", GETPOST('login')), 'errors');
 					$action="edit";       // Go back to create page
 					$error++;
 				}