diff options
| author | Brion Vibber <brion@pobox.com> | 2010-05-05 17:11:23 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-05-05 17:11:23 -0700 |
| commit | 173778eab145cfd73f597cd75db195e4d47fe323 (patch) | |
| tree | 78034559817d04f7fd6531f270e857b3bd55bf72 /classes/User.php | |
| parent | ddc7811a7b412c9c3c4b6bfb9350dd18a62fdf51 (diff) | |
| parent | e05415f621890bbaf42752577249ecdc22c161fc (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
lib/xmppmanager.php (resolved: code has moved to XmppPlugin.php)
Diffstat (limited to 'classes/User.php')
| -rw-r--r-- | classes/User.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/User.php b/classes/User.php index 4626a7ca1..314b80531 100644 --- a/classes/User.php +++ b/classes/User.php @@ -459,9 +459,9 @@ class User extends Memcached_DataObject return $profile->getNotices($offset, $limit, $since_id, $before_id); } - function favoriteNotices($offset=0, $limit=NOTICES_PER_PAGE, $own=false) + function favoriteNotices($own=false, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0) { - $ids = Fave::stream($this->id, $offset, $limit, $own); + $ids = Fave::stream($this->id, $offset, $limit, $own, $since_id, $max_id); return Notice::getStreamByIds($ids); } |