summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-02-04 15:19:09 -0800
committerBrion Vibber <brion@pobox.com>2010-02-04 15:19:09 -0800
commit509c8fc51589a4cc6a3281e012ce759ab9bed532 (patch)
treeecc05ca214c066ffab890a2de411a22d52f58688 /classes
parentba26ffeef19576fe2587007de43b5077b0cd6aa5 (diff)
parent4502bea9a86fe5992eb9b359d90f0c1f004998c1 (diff)
Merge branch 'master' into testing - drop debug statements
Diffstat (limited to 'classes')
-rw-r--r--classes/Inbox.php4
1 files changed, 0 insertions, 4 deletions
diff --git a/classes/Inbox.php b/classes/Inbox.php
index 029410799..be62611a1 100644
--- a/classes/Inbox.php
+++ b/classes/Inbox.php
@@ -212,11 +212,9 @@ class Inbox extends Memcached_DataObject
$wanted = count($firstChunk); // raw entry count in the inbox up to our $limit
if ($notices->N >= $wanted) {
- common_log(LOG_DEBUG, __METHOD__ . " ok got $wanted items");
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.
assert($notices instanceof ArrayWrapper);
$items = $notices->_items;
@@ -225,10 +223,8 @@ class Inbox extends Memcached_DataObject
while (count($items) < $wanted && count($remainder) > 0) {
$notice = Notice::staticGet(array_shift($remainder));
if ($notice) {
- common_log(LOG_DEBUG, __METHOD__ . " got another one");
$items[] = $notice;
} else {
- common_log(LOG_DEBUG, __METHOD__ . " skipping another deleted one");
}
}
return new ArrayWrapper($items);