diff options
author | Evan Prodromou <evan@status.net> | 2010-05-21 16:47:57 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-05-21 16:47:57 -0400 |
commit | 6d8e01ad13dd9bc9e149f43a1eb88671d4737f4d (patch) | |
tree | 12f8b318971d1a1eebbb318e3c19142a56dce444 /actions/apitimelinefavorites.php | |
parent | 8a2144aeed2e338ef1b21425b9387086790aa820 (diff) | |
parent | bbfd6eff0c69f038d151d3bf6c8bf9b45a64716f (diff) |
Merge branch 'master' of gitorious.org:statusnet/mainline
Diffstat (limited to 'actions/apitimelinefavorites.php')
-rw-r--r-- | actions/apitimelinefavorites.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php index 8cb2e808d..79632447e 100644 --- a/actions/apitimelinefavorites.php +++ b/actions/apitimelinefavorites.php @@ -185,17 +185,23 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction { $notices = array(); + common_debug("since id = " . $this->since_id . " max id = " . $this->max_id); + if (!empty($this->auth_user) && $this->auth_user->id == $this->user->id) { $notice = $this->user->favoriteNotices( + true, ($this->page-1) * $this->count, $this->count, - true + $this->since_id, + $this->max_id ); } else { $notice = $this->user->favoriteNotices( + false, ($this->page-1) * $this->count, $this->count, - false + $this->since_id, + $this->max_id ); } |