X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=blobdiff_plain;f=modules%2Ferl%2Feuphorik_protocole.erl;fp=modules%2Ferl%2Feuphorik_protocole.erl;h=3706f687227045eb7e3e49768b226af3744f5bc1;hp=1fb3cc161ea9fa358cef4920a6b1482f4c681406;hb=85dc0facbc2b2de826978fac3768db7949a6b92f;hpb=455f79e2ab07847ea6697e51245288832ae9fede

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