diff options
author | Sarven Capadisli <csarven@status.net> | 2010-03-02 15:26:27 -0500 |
---|---|---|
committer | Sarven Capadisli <csarven@status.net> | 2010-03-02 15:26:27 -0500 |
commit | e9c127ddd869f44eafe7ae6b30d9dc69df8b863c (patch) | |
tree | a5847af8504385223110b579c9dab702cd766afa /actions/apitimelinefriends.php | |
parent | 4113f28851020509163a31ab20658429d86c3134 (diff) | |
parent | 72460091ddc6763cb8d62f9d865390ea4973dd44 (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'actions/apitimelinefriends.php')
-rw-r--r-- | actions/apitimelinefriends.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php index 2db76857e..9ef3ace60 100644 --- a/actions/apitimelinefriends.php +++ b/actions/apitimelinefriends.php @@ -202,11 +202,11 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction if (!empty($this->auth_user) && $this->auth_user->id == $this->user->id) { $notice = $this->user->ownFriendsTimeline(($this->page-1) * $this->count, $this->count, $this->since_id, - $this->max_id, $this->since); + $this->max_id); } else { $notice = $this->user->friendsTimeline(($this->page-1) * $this->count, $this->count, $this->since_id, - $this->max_id, $this->since); + $this->max_id); } while ($notice->fetch()) { |