projects
/
euphorik.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FIX #88
[euphorik.git]
/
modules
/
erl
/
euphorik_protocole.erl
diff --git
a/modules/erl/euphorik_protocole.erl
b/modules/erl/euphorik_protocole.erl
index
a34eae6
..
24768ea
100755
(executable)
--- a/
modules/erl/euphorik_protocole.erl
+++ b/
modules/erl/euphorik_protocole.erl
@@
-283,7
+283,7
@@
wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id
{struct, [
\r
{reply, "new_troll"},
\r
{troll_id, Current#troll.id},
\r
{struct, [
\r
{reply, "new_troll"},
\r
{troll_id, Current#troll.id},
\r
- {message_id,
euphorik_bd:message_id_associe(Current#troll.id)
},
\r
+ {message_id,
Current#troll.id_minichat
},
\r
{content, Current#troll.content}
\r
]};
\r
_ ->
\r
{content, Current#troll.content}
\r
]};
\r
_ ->
\r
@@
-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
{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
_ ->
\r
null
\r
end
\r