Merge branch 'master' into FeedPoller

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

diff --git a/lib/inboxnoticestream.php b/lib/inboxnoticestream.php
index 58b007505084baa76ab557c23d48249ff69406c4..27fec9518b62110b835d13fbe09d0ee84072cdbd 100644 (file)
--- a/lib/inboxnoticestream.php
+++ b/lib/inboxnoticestream.php
@@ -57,7 +57,7 @@ class InboxNoticeStream extends ScopingNoticeStream
             $profile = Profile::current();
         }
         // Note: we don't use CachingNoticeStream since RawInboxNoticeStream
-        // uses Inbox::staticGet(), which is cached.
+        // uses Inbox::getKV(), which is cached.
         parent::__construct(new RawInboxNoticeStream($user), $profile);
     }
 }
@@ -85,7 +85,7 @@ class RawInboxNoticeStream extends NoticeStream
     function __construct($user)
     {
         $this->user  = $user;
-        $this->inbox = Inbox::staticGet('user_id', $user->id);
+        $this->inbox = Inbox::getKV('user_id', $user->id);
     }
 
     /**
@@ -144,7 +144,7 @@ class RawInboxNoticeStream extends NoticeStream
 
             $ids = $this->getNoticeIds($offset, $limit, $sinceId, $maxId);
 
-            $notices = Memcached_DataObject::pivotGet('Notice', 'id', $ids);
+            $notices = Notice::pivotGet('id', $ids);
 
             // By default, takes out false values