forked from GNUsocial/gnu-social
		
	Merge branch '1.0.x' into limitdist2
This commit is contained in:
		| @@ -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(); | ||||
|  | ||||
|   | ||||
| @@ -74,7 +74,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); | ||||
|  | ||||
|   | ||||
| @@ -67,7 +67,7 @@ class PublicNoticeStream extends ScopingNoticeStream | ||||
|  | ||||
| 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(); | ||||
|  | ||||
|   | ||||
| @@ -74,7 +74,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; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user