eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into testing - drop debug statements

Browse Source
This commit is contained in:
Brion Vibber 2010-02-04 15:19:09 -08:00
commit 509c8fc515
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/Inbox.php
View File

@ -212,11 +212,9 @@ class Inbox extends Memcached_DataObject
$wanted = count($firstChunk); // raw entry count in the inbox up to our $limit $wanted = count($firstChunk); // raw entry count in the inbox up to our $limit
if ($notices->N >= $wanted) { if ($notices->N >= $wanted) {
common_log(LOG_DEBUG, __METHOD__ . " ok got $wanted items");
return $notices; return $notices;
} }
common_log(LOG_DEBUG, __METHOD__ . " got $notices->N of $wanted items, getting more");
// There were deleted notices, we'll need to look for more. // There were deleted notices, we'll need to look for more.
assert($notices instanceof ArrayWrapper); assert($notices instanceof ArrayWrapper);
$items = $notices->_items; $items = $notices->_items;
@ -225,10 +223,8 @@ class Inbox extends Memcached_DataObject
while (count($items) < $wanted && count($remainder) > 0) { while (count($items) < $wanted && count($remainder) > 0) {
$notice = Notice::staticGet(array_shift($remainder)); $notice = Notice::staticGet(array_shift($remainder));
if ($notice) { if ($notice) {
common_log(LOG_DEBUG, __METHOD__ . " got another one");
$items[] = $notice; $items[] = $notice;
} else { } else {
common_log(LOG_DEBUG, __METHOD__ . " skipping another deleted one");
} }
} }
return new ArrayWrapper($items); return new ArrayWrapper($items);