Merge remote-tracking branch 'upstream/nightly' into nightly

[quix0rs-gnu-social.git] / classes / Profile_list.php

diff --git a/classes/Profile_list.php b/classes/Profile_list.php
index 000e10b41f5fb7cc598c7c7a2d7ffa37378e98ed..b60f4afffdc6d008886015a7ecc3154f7195e20a 100644 (file)
--- a/classes/Profile_list.php
+++ b/classes/Profile_list.php
@@ -171,7 +171,9 @@ class Profile_list extends Managed_DataObject
 
     function getNotices($offset, $limit, $since_id=null, $max_id=null)
     {
-        $stream = new PeopletagNoticeStream($this);
+        // FIXME: Use something else than Profile::current() to avoid
+        // possible confusion between session user and queue processing.
+        $stream = new PeopletagNoticeStream($this, Profile::current());
 
         return $stream->getNotices($offset, $limit, $since_id, $max_id);
     }