let Inbox class go fingerpokin' in streams

diff --git a/classes/Inbox.php b/classes/Inbox.php
index f0f626a24e765acb36edc6f40ad047f9b48e27d8..feaead249be516731992326a3e9ad288ec17413e 100644 (file)
--- a/classes/Inbox.php
+++ b/classes/Inbox.php
@@ -233,7 +233,7 @@ class Inbox extends Memcached_DataObject
         // Do a bulk lookup for the first $limit items
         // Fast path when nothing's deleted.
         $firstChunk = array_slice($ids, 0, $offset + $limit);
-        $notices = Notice::getStreamByIds($firstChunk);
+        $notices = NoticeStream::getStreamByIds($firstChunk);
 
         assert($notices instanceof ArrayWrapper);
         $items = $notices->_items;
@@ -292,7 +292,7 @@ class Inbox extends Memcached_DataObject
         // Do a bulk lookup for the first $limit items
         // Fast path when nothing's deleted.
         $firstChunk = array_slice($ids, 0, $limit);
-        $notices = Notice::getStreamByIds($firstChunk);
+        $notices = NoticeStream::getStreamByIds($firstChunk);
 
         $wanted = count($firstChunk); // raw entry count in the inbox up to our $limit
         if ($notices->N >= $wanted) {

diff --git a/lib/noticestream.php b/lib/noticestream.php
index 2b6e10f7b92c59d8581eddc4395a552833a3d99f..a96eb53da627ce89f84fbef85b9a81324af1495e 100644 (file)
--- a/lib/noticestream.php
+++ b/lib/noticestream.php
@@ -62,7 +62,7 @@ class NoticeStream
     {
         $ids = $this->getNoticeIds($offset, $limit, $sinceId, $maxId);
 
-        $notices = $this->getStreamByIds($ids);
+        $notices = self::getStreamByIds($ids);
 
         return $notices;
     }
@@ -136,7 +136,7 @@ class NoticeStream
         return $ids;
     }
 
-    function getStreamByIds($ids)
+    static function getStreamByIds($ids)
     {
         $cache = Cache::instance();