Get group attentions back into the "all" feed

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

diff --git a/lib/inboxnoticestream.php b/lib/inboxnoticestream.php
index 84cac7c67b97462f68e628bd5fda50b96ec24ade..57c5e0c80e029e565a381e109286220e7a9d51e2 100644 (file)
--- a/lib/inboxnoticestream.php
+++ b/lib/inboxnoticestream.php
@@ -107,7 +107,8 @@ class RawInboxNoticeStream extends NoticeStream
         // Subscription:: is a table of subscriptions (every user is subscribed to themselves)
         $notice->whereAdd(
                 sprintf('notice.id IN (SELECT notice_id FROM reply WHERE profile_id=%1$d) ' .
-                        'OR notice.profile_id IN (SELECT subscribed FROM subscription WHERE subscriber=%d) ' .
+                        'OR notice.profile_id IN (SELECT subscribed FROM subscription WHERE subscriber=%1$d) ' .
+                        'OR notice.id IN (SELECT notice_id FROM group_inbox WHERE group_id IN (SELECT group_id FROM group_member WHERE profile_id=%1$d))' .
                         'OR notice.id IN (SELECT notice_id FROM attention WHERE profile_id=%1$d)',
                     $this->target->id)
             );