We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 6b6c9663 authored by Evan Prodromou's avatar Evan Prodromou

don't write notice to inbox if user isn't inboxed yet

darcs-hash:20081114074211-84dde-77dbee17b2eb5848a0aa012c6ebe352135f5e7c1.gz
parent 11fba882
......@@ -374,14 +374,19 @@ class Notice extends Memcached_DataObject
}
function addToInboxes() {
$inbox = new Notice_inbox();
$inbox->query('INSERT INTO notice_inbox (user_id, notice_id, created) ' .
'SELECT user.id, ' . $this->id . ', "' . $this->created . '" ' .
'FROM user JOIN subscription ON user.id = subscription.subscriber ' .
'WHERE subscription.subscribed = ' . $this->profile_id);
$enabled = common_config('inboxes', 'enabled');
if ($enabled === true || $enabled === 'transitional') {
$inbox = new Notice_inbox();
$qry = 'INSERT INTO notice_inbox (user_id, notice_id, created) ' .
'SELECT user.id, ' . $this->id . ', "' . $this->created . '" ' .
'FROM user JOIN subscription ON user.id = subscription.subscriber ' .
'WHERE subscription.subscribed = ' . $this->profile_id;
if ($enabled === 'transitional') {
$qry .= ' AND user.inboxed = 1';
}
$inbox->query($qry);
}
return;
}
......@@ -389,9 +394,13 @@ class Notice extends Memcached_DataObject
function blowInboxes() {
$inbox = new Notice_inbox();
$inbox->notice_id = $this->id;
$inbox->delete();
$enabled = common_config('inboxes', 'enabled');
if ($enabled === true || $enabled === 'transitional') {
$inbox = new Notice_inbox();
$inbox->notice_id = $this->id;
$inbox->delete();
}
return;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment