Merge branch 'site-notice' into 'nightly'

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

diff --git a/classes/Notice_tag.php b/classes/Notice_tag.php
index 663efe7b80122c181b42273f786c2faa452a426b..9d6bec6d2f401b2ae4ec7f8cdd971198815c84f9 100644 (file)
--- a/classes/Notice_tag.php
+++ b/classes/Notice_tag.php
@@ -55,9 +55,10 @@ class Notice_tag extends Managed_DataObject
     
     static function getStream($tag, $offset=0, $limit=20, $sinceId=0, $maxId=0)
     {
-        $stream = new TagNoticeStream($tag);
-        
-        return $stream->getNotices($offset, $limit, $sinceId, $maxId);
+        // FIXME: Get the Profile::current value some other way
+        // to avoid confusino between queue processing and session.
+        $stream = new TagNoticeStream($tag, Profile::current());
+        return $stream;
     }
 
     function blowCache($blowLast=false)
@@ -68,11 +69,6 @@ class Notice_tag extends Managed_DataObject
         }
     }
 
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Notice_tag', $kv);
-    }
-
        static function url($tag)
        {
                if (common_config('singleuser', 'enabled')) {