GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

Browse Source
This commit is contained in:
Brion Vibber
2010-01-15 09:52:50 -08:00
parent a27aef9206 038287c1ff
commit ef016dca45
7 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
classes/Inbox.php
View File

@@ -103,9 +103,9 @@ class Inbox extends Memcached_DataObject
static function insertNotice($user_id, $notice_id)
{
$inbox = Inbox::staticGet('user_id', $user_id);
$inbox = DB_DataObject::staticGet('inbox', 'user_id', $user_id);
if (empty($inbox) || $inbox->fake) {
if (empty($inbox)) {
$inbox = Inbox::initialize($user_id);
}
@@ -153,8 +153,19 @@ class Inbox extends Memcached_DataObject
$ids = unpack('N*', $inbox->notice_ids);
// XXX: handle since_id
// XXX: handle max_id
if (!empty($since_id)) {
$i = array_search($since_id, $ids);
if ($i !== false) {
$ids = array_slice($ids, 0, $i - 1);
}
}
if (!empty($max_id)) {
$i = array_search($max_id, $ids);
if ($i !== false) {
$ids = array_slice($ids, $i - 1);
}
}
$ids = array_slice($ids, $offset, $limit);