REPORT de la branche 1.1 : 477->494

[euphorik.git] / modules / erl / euphorik_protocole.erl

diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl
index 1fb3cc1..3706f68 100755 (executable)
--- a/modules/erl/euphorik_protocole.erl
+++ b/modules/erl/euphorik_protocole.erl
@@ -308,7 +308,7 @@ wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id
                                        {Racine_id, _, _} = Racine,\r
                                        case euphorik_bd:message_by_id(Racine_id) of\r
                                           {ok, Mess} ->\r
-                                             json_message(Mess, euphorik_bd:parents(Racine), User);\r
+                                             json_message(Mess, euphorik_bd:parents(Racine_id), User);\r
                                           _ ->\r
                                              null\r
                                        end\r
@@ -744,7 +744,7 @@ json_message(Mess, Repond_a, User) ->
    {struct, [\r
       {id, Mess#minichat.id},\r
       {user_id, User_mess#user.id},\r
-      {date, format_date(Mess#minichat.date)},\r
+      {date, case Mess#minichat.date of undefined -> "?"; _ -> format_date(Mess#minichat.date) end},\r
       {system, Mess#minichat.auteur_id =:= 0},\r
       {owner, Est_proprietaire},\r
       {answered, A_repondu_a_message},\r