tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Conversations are working now too

Browse source
This commit is contained in:
Michael Vogel 2016-03-14 20:04:17 +01:00 committed by Roland Haeder
parent 3e79a19e57
commit 2446c56e50
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/diaspora2.php
View file

@ -918,7 +918,7 @@ class diaspora {
return $message_id; return $message_id;
} }
private function receive_conversation_message($importer, $contact, $data, $msg, $mesg) { private function receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation) {
$guid = notags(unxmlify($data->guid)); $guid = notags(unxmlify($data->guid));
$subject = notags(unxmlify($data->subject)); $subject = notags(unxmlify($data->subject));
$author = notags(unxmlify($data->author)); $author = notags(unxmlify($data->author));
@ -1086,7 +1086,7 @@ class diaspora {
} }
foreach($messages as $mesg) foreach($messages as $mesg)
self::receive_conversation_message($importer, $contact, $data, $msg, $mesg); self::receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation);
return true; return true;
} }