summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-02-26 13:45:43 -0800
committerEvan Prodromou <evan@controlyourself.ca>2009-02-26 13:45:43 -0800
commitbaf5afb26339f410a24a7ae5064d6c7a9029e86c (patch)
treecb24183fb4b2d3909f109d465443dc72023464a1
parentd1f46d85521876678152f2d06b61cbf212356f6f (diff)
save conversation id when saving a notice
-rw-r--r--classes/Notice.php18
1 files changed, 17 insertions, 1 deletions
diff --git a/classes/Notice.php b/classes/Notice.php
index ce5243841..c321311ac 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -156,13 +156,20 @@ class Notice extends Memcached_DataObject
$notice->query('BEGIN');
- $notice->reply_to = $reply_to;
$notice->created = common_sql_now();
$notice->content = common_shorten_links($content);
$notice->rendered = common_render_content($notice->content, $notice);
$notice->source = $source;
$notice->uri = $uri;
+ if (!empty($reply_to)) {
+ $reply_notice = Notice::staticGet('id', $reply_to);
+ if (!empty($reply_notice)) {
+ $notice->reply_to = $reply_to;
+ $notice->conversation = $reply_notice->conversation;
+ }
+ }
+
if (Event::handle('StartNoticeSave', array(&$notice))) {
$id = $notice->insert();
@@ -707,6 +714,7 @@ class Notice extends Memcached_DataObject
if ($recipient_notice) {
$orig = clone($this);
$this->reply_to = $recipient_notice->id;
+ $this->conversation = $recipient_notice->conversation;
$this->update($orig);
}
}
@@ -756,6 +764,14 @@ class Notice extends Memcached_DataObject
}
}
+ // If it's not a reply, make it the root of a new conversation
+
+ if (empty($this->conversation)) {
+ $orig = clone($this);
+ $this->conversation = $this->id;
+ $this->update($orig);
+ }
+
foreach (array_keys($replied) as $recipient) {
$user = User::staticGet('id', $recipient);
if ($user) {