Merge branch 'master' into 0.8.x

This commit is contained in:
Evan Prodromou 2009-09-24 17:15:36 -04:00
commit b5b3690eef
1 changed files with 2 additions and 1 deletions

View File

@ -897,7 +897,8 @@ class Notice extends Memcached_DataObject
$qry .= '('.$id.', '.$this->id.', '.$source.", '".$this->created. "') ";
$cnt++;
if (rand() % NOTICE_INBOX_SOFT_LIMIT == 0) {
Notice_inbox::gc($id);
// FIXME: Causes lag in replicated servers
// Notice_inbox::gc($id);
}
if ($cnt >= MAX_BOXCARS) {
$inbox = new Notice_inbox();