From 7a56637baa463ca738afcbb9395c333a30574eb2 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 25 Mar 2011 16:15:55 -0400
Subject: [PATCH] Make function signature for getNoticeIds agree

There were some differences between defaults for the
NoticeStream::getNoticeIds() function and some of its subclasses'
implementations. So, I got them rationalized.
---
 lib/cachingnoticestream.php      | 2 +-
 lib/conversationnoticestream.php | 2 +-
 lib/noticestream.php             | 4 ++--
 lib/publicnoticestream.php       | 2 +-
 lib/replynoticestream.php        | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/cachingnoticestream.php b/lib/cachingnoticestream.php
index 0b5aa33a37..f8ab2a85af 100644
--- a/lib/cachingnoticestream.php
+++ b/lib/cachingnoticestream.php
@@ -58,7 +58,7 @@ class CachingNoticeStream extends NoticeStream
         $this->cachekey = $cachekey;
     }
 
-    function getNoticeIds($offset=0, $limit=20, $sinceId=0, $maxId=0)
+    function getNoticeIds($offset, $limit, $sinceId, $maxId)
     {
         $cache = Cache::instance();
 
diff --git a/lib/conversationnoticestream.php b/lib/conversationnoticestream.php
index b26e898612..dbba6cd6f0 100644
--- a/lib/conversationnoticestream.php
+++ b/lib/conversationnoticestream.php
@@ -18,7 +18,7 @@ class RawConversationNoticeStream extends NoticeStream
         $this->id = $id;
     }
 
-    function getNoticeIds($offset=0, $limit=20, $since_id=0, $max_id=0)
+    function getNoticeIds($offset, $limit, $since_id, $max_id)
     {
         $notice = new Notice();
 
diff --git a/lib/noticestream.php b/lib/noticestream.php
index b60fc236f7..025138be4d 100644
--- a/lib/noticestream.php
+++ b/lib/noticestream.php
@@ -46,9 +46,9 @@ if (!defined('STATUSNET')) {
  */
 abstract class NoticeStream
 {
-    abstract function getNoticeIds($offset, $limit, $sinceId, $maxId);
+    abstract function getNoticeIds($offset, $limit, $since_id, $max_id);
 
-    function getNotices($offset=0, $limit=20, $sinceId=0, $maxId=0)
+    function getNotices($offset, $limit, $sinceId, $maxId)
     {
         $ids = $this->getNoticeIds($offset, $limit, $sinceId, $maxId);
 
diff --git a/lib/publicnoticestream.php b/lib/publicnoticestream.php
index 0162375451..6a861ca26e 100644
--- a/lib/publicnoticestream.php
+++ b/lib/publicnoticestream.php
@@ -10,7 +10,7 @@ class PublicNoticeStream extends CachingNoticeStream
 
 class RawPublicNoticeStream extends NoticeStream
 {
-    function getNoticeIds($offset=0, $limit=20, $since_id=0, $max_id=0)
+    function getNoticeIds($offset, $limit, $since_id, $max_id)
     {
         $notice = new Notice();
 
diff --git a/lib/replynoticestream.php b/lib/replynoticestream.php
index f358afcc54..d0ae5fc4a7 100644
--- a/lib/replynoticestream.php
+++ b/lib/replynoticestream.php
@@ -18,7 +18,7 @@ class RawReplyNoticeStream extends NoticeStream
         $this->userId = $userId;
     }
 
-    function getNoticeIds($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0)
+    function getNoticeIds($offset, $limit, $since_id, $max_id)
     {
         $reply = new Reply();
         $reply->profile_id = $this->userId;