Commit 7a56637b authored by Evan Prodromou's avatar Evan Prodromou

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.
parent 074be0d5
......@@ -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();
......
......@@ -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();
......
......@@ -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);
......
......@@ -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();
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment