diff options
author | Evan Prodromou <evan@status.net> | 2009-12-30 09:06:07 -1000 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-01-09 10:02:07 -0800 |
commit | f2a403589cc8858ec3d3ce70f09709f36277c348 (patch) | |
tree | cd12a96460dfd2061e1de84a37b97160580760a0 /classes/Notice.php | |
parent | 7ec27b657e6b7ad9416e531cf70fffcf48614708 (diff) |
Use inbox instead of notice_inbox
Diffstat (limited to 'classes/Notice.php')
-rw-r--r-- | classes/Notice.php | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/classes/Notice.php b/classes/Notice.php index 9bda47827..8783912e8 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -125,8 +125,7 @@ class Notice extends Memcached_DataObject 'Fave', 'Notice_tag', 'Group_inbox', - 'Queue_item', - 'Notice_inbox'); + 'Queue_item'); foreach ($related as $cls) { $inst = new $cls(); @@ -504,17 +503,6 @@ class Notice extends Memcached_DataObject unset($original); } - $ni = new Notice_inbox(); - - $ni->notice_id = $this->id; - - if ($ni->find()) { - while ($ni->fetch()) { - $tmk = common_cache_key('user:repeated_to_me:'.$ni->user_id); - $cache->delete($tmk); - } - } - $ni->free(); unset($ni); } @@ -844,10 +832,6 @@ class Notice extends Memcached_DataObject function addToInboxes() { - // XXX: loads constants - - $inbox = new Notice_inbox(); - $users = $this->getSubscribedUsers(); // FIXME: kind of ignoring 'transitional'... @@ -887,7 +871,7 @@ class Notice extends Memcached_DataObject } } - Notice_inbox::bulkInsert($this->id, $this->created, $ni); + Inbox::bulkInsert($this->id, array_keys($ni)); return; } |