diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-06-09 21:51:24 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-06-09 21:51:24 -0700 |
| commit | 4df1ea49ec75ec9dd64bc8f58c01e64ea18bedc7 (patch) | |
| tree | 91535b33cd2b62b0726821e4d217d587da7cd61b /classes/Profile.php | |
| parent | b3628b78448266fda2368f1317e70d1cca45ac17 (diff) | |
| parent | ed627bb4bd6424325478412055d295b185f9f662 (diff) | |
Merge branch '0.8.x' into userdesign
Conflicts:
actions/designsettings.php
Diffstat (limited to 'classes/Profile.php')
| -rw-r--r-- | classes/Profile.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/Profile.php b/classes/Profile.php index afc0ea4f7..4a459b974 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -170,7 +170,7 @@ class Profile extends Memcached_DataObject $ids = Notice::stream(array($this, '_streamDirect'), array(), 'profile:notice_ids:' . $this->id, - $offset, $limit, $since_id, $before_id, $since); + $offset, $limit, $since_id, $max_id, $since); return Notice::getStreamByIds($ids); } @@ -225,8 +225,8 @@ class Profile extends Memcached_DataObject $notice->whereAdd('id > ' . $since_id); } - if ($before_id != 0) { - $notice->whereAdd('id < ' . $before_id); + if ($max_id != 0) { + $notice->whereAdd('id <= ' . $max_id); } if (!is_null($since)) { |