Merge branch 'master' into 0.8.x

diff --git a/classes/Notice.php b/classes/Notice.php
index 89afe9d1dca74da958082c68153e8bb01d560230..7d050262674265f13dfe0cbeb577aa1a41e62c9a 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -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();