]> git.mxchange.org Git - friendica.git/commitdiff
Conversations are working now too
authorMichael Vogel <icarus@dabo.de>
Mon, 14 Mar 2016 19:04:17 +0000 (20:04 +0100)
committerMichael Vogel <icarus@dabo.de>
Mon, 14 Mar 2016 19:04:17 +0000 (20:04 +0100)
include/diaspora2.php

index 5c17754e80b13c13399e4936e0be94899495575b..c0e054c384a6e89faaea7a5eb31de2409d55f6cf 100644 (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));
                $subject = notags(unxmlify($data->subject));
                $author = notags(unxmlify($data->author));
                $guid = notags(unxmlify($data->guid));
                $subject = notags(unxmlify($data->subject));
                $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;
        }