diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-02 12:21:48 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-02 12:21:48 -0800 |
| commit | 72460091ddc6763cb8d62f9d865390ea4973dd44 (patch) | |
| tree | 78c13bbd3cc8774ad1bee1c92bfe0982744f8c89 /actions/apitimelinehome.php | |
| parent | e3c2b8e0b50d750ad35cb313726fd2706684c09b (diff) | |
| parent | b1ffbf17d3da90f4c509a47c9fd876304ed9e3fc (diff) | |
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'actions/apitimelinehome.php')
| -rw-r--r-- | actions/apitimelinehome.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/apitimelinehome.php b/actions/apitimelinehome.php index 0c72f4020..abd387786 100644 --- a/actions/apitimelinehome.php +++ b/actions/apitimelinehome.php @@ -200,13 +200,13 @@ class ApiTimelineHomeAction extends ApiBareAuthAction $notice = $this->user->noticeInbox( ($this->page-1) * $this->count, $this->count, $this->since_id, - $this->max_id, $this->since + $this->max_id ); } else { $notice = $this->user->noticesWithFriends( ($this->page-1) * $this->count, $this->count, $this->since_id, - $this->max_id, $this->since + $this->max_id ); } |