From 3734555715ab780c1d951c7c9d59c91b76b17b39 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Mon, 14 Mar 2016 20:04:17 +0100
Subject: [PATCH] Conversations are working now too

---
 include/diaspora2.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/diaspora2.php b/include/diaspora2.php
index 5c17754e8..c0e054c38 100644
--- a/include/diaspora2.php
+++ b/include/diaspora2.php
@@ -918,7 +918,7 @@ class diaspora {
 		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));
@@ -1086,7 +1086,7 @@ class diaspora {
 		}
 
 		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;
 	}