diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-06-08 11:55:32 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-06-08 11:55:32 -0700 |
| commit | adfb79a9bbdfb43f35c0f022c1de6118b10ce115 (patch) | |
| tree | e14ec0cc5161cfd5cc321eaaa5b8eed07df952de /classes/Profile.php | |
| parent | 1a126032efbcb265a59f4d682bd072251f857c97 (diff) | |
| parent | 265e2bd58de2a01e0d7840310eb44b21b70e3914 (diff) | |
Merge branch '0.7.x' into 0.8.x
Conflicts:
classes/Notice.php
classes/Profile.php
lib/common.php
lib/util.php
scripts/getvaliddaemons.php
scripts/stopdaemons.sh
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)) { |