From e41d324a5388ac9d341e1f68de79aae2f97ed729 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Tue, 3 Feb 2015 12:12:11 +0100 Subject: [PATCH] NoticeStream already handles "getNotices" --- lib/inboxnoticestream.php | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/lib/inboxnoticestream.php b/lib/inboxnoticestream.php index 87868b1d79..b5a8877d99 100644 --- a/lib/inboxnoticestream.php +++ b/lib/inboxnoticestream.php @@ -136,30 +136,4 @@ class RawInboxNoticeStream extends NoticeStream return $ids; } - - function getNotices($offset, $limit, $sinceId, $maxId) - { - $all = array(); - - do { - - $ids = $this->getNoticeIds($offset, $limit, $sinceId, $maxId); - - $notices = Notice::pivotGet('id', $ids); - - // By default, takes out false values - - $notices = array_filter($notices); - - $all = array_merge($all, $notices); - - if (count($notices < count($ids))) { - $offset += $limit; - $limit -= count($notices); - } - - } while (count($notices) < count($ids) && count($ids) > 0); - - return new ArrayWrapper($all); - } }