From a490d634db3bcd4edc2cb455287ed4c4008d0c44 Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Wed, 4 Jun 2014 23:21:37 +0200
Subject: [PATCH] Repeats were not delivered a conversation ID

Vinilox noticed that replies to repeats ended up outside of the original
notice's conversations.
---
 classes/Notice.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/classes/Notice.php b/classes/Notice.php
index 461e8f9aab..c6ae3c9155 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -507,7 +507,8 @@ class Notice extends Managed_DataObject
                 throw new ClientException(_('You already repeated that notice.'));
             }
 
-            $notice->repeat_of = $repeat_of;
+            $notice->repeat_of = $repeat->id;
+            $notice->conversation = $repeat->conversation;
         } else {
             $reply = null;