Merge commit 'refs/merge-requests/41' of https://gitorious.org/social/mainline into...

[quix0rs-gnu-social.git] / lib / threadingnoticestream.php

diff --git a/lib/threadingnoticestream.php b/lib/threadingnoticestream.php
index c4b35f4092557f361e11e7eea88cb82241af263c..167a9584a6d7641e7c3ecb2d30245a1f282b8e14 100644 (file)
--- a/lib/threadingnoticestream.php
+++ b/lib/threadingnoticestream.php
@@ -60,8 +60,8 @@ class ThreadingNoticeStream extends FilteringNoticeStream
 
     function filter($notice)
     {
-        if (!array_key_exists($notice->id, $this->seen)) {
-            $this->seen[$notice->id] = true;
+        if (!array_key_exists($notice->conversation, $this->seen)) {
+            $this->seen[$notice->conversation] = true;
             return true;
         } else {
             return false;