diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-02 13:38:10 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-02 13:38:10 -0800 |
| commit | ddf3614c843bcd8d9ecfd0850ac9a8cefae6dbba (patch) | |
| tree | 07b772b280e6f23761c0111d953b3c2f5b8d2120 /actions/apitimelinefriends.php | |
| parent | 8629664ed90ffb496f607d15491821217f6b3126 (diff) | |
| parent | e9c127ddd869f44eafe7ae6b30d9dc69df8b863c (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
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()) { |