wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '1.0.x' into limitdist2

Browse Source
This commit is contained in:
Evan Prodromou 2011-03-25 16:18:10 -04:00
commit d69f912b00
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cachingnoticestream.php
View File

@ -58,7 +58,7 @@ class CachingNoticeStream extends NoticeStream
$this->cachekey = $cachekey; $this->cachekey = $cachekey;
} }
function getNoticeIds($offset=0, $limit=20, $sinceId=0, $maxId=0) function getNoticeIds($offset, $limit, $sinceId, $maxId)
{ {
$cache = Cache::instance(); $cache = Cache::instance();

2
lib/conversationnoticestream.php
View File

@ -74,7 +74,7 @@ class RawConversationNoticeStream extends NoticeStream
$this->id = $id; $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(); $notice = new Notice();

4
lib/noticestream.php
View File

@ -46,9 +46,9 @@ if (!defined('STATUSNET')) {
*/ */
abstract class NoticeStream 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); $ids = $this->getNoticeIds($offset, $limit, $sinceId, $maxId);

2
lib/publicnoticestream.php
View File

@ -67,7 +67,7 @@ class PublicNoticeStream extends ScopingNoticeStream
class RawPublicNoticeStream extends NoticeStream 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(); $notice = new Notice();

2
lib/replynoticestream.php
View File

@ -74,7 +74,7 @@ class RawReplyNoticeStream extends NoticeStream
$this->userId = $userId; $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 = new Reply();
$reply->profile_id = $this->userId; $reply->profile_id = $this->userId;