wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
darcs-hash:20081114074211-84dde-77dbee17b2eb5848a0aa012c6ebe352135f5e7c1.gz
This commit is contained in:
Evan Prodromou 2008-11-14 02:42:11 -05:00
parent 11fba88213
commit 6b6c966369
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
classes/Notice.php
View File

@ -374,14 +374,19 @@ class Notice extends Memcached_DataObject
} }
function addToInboxes() { function addToInboxes() {
$enabled = common_config('inboxes', 'enabled');
if ($enabled === true || $enabled === 'transitional') {
$inbox = new Notice_inbox(); $inbox = new Notice_inbox();
$qry = 'INSERT INTO notice_inbox (user_id, notice_id, created) ' .
$inbox->query('INSERT INTO notice_inbox (user_id, notice_id, created) ' .
'SELECT user.id, ' . $this->id . ', "' . $this->created . '" ' . 'SELECT user.id, ' . $this->id . ', "' . $this->created . '" ' .
'FROM user JOIN subscription ON user.id = subscription.subscriber ' . 'FROM user JOIN subscription ON user.id = subscription.subscriber ' .
'WHERE subscription.subscribed = ' . $this->profile_id); 'WHERE subscription.subscribed = ' . $this->profile_id;
if ($enabled === 'transitional') {
$qry .= ' AND user.inboxed = 1';
}
$inbox->query($qry);
}
return; return;
} }
@ -389,9 +394,13 @@ class Notice extends Memcached_DataObject
function blowInboxes() { function blowInboxes() {
$enabled = common_config('inboxes', 'enabled');
if ($enabled === true || $enabled === 'transitional') {
$inbox = new Notice_inbox(); $inbox = new Notice_inbox();
$inbox->notice_id = $this->id; $inbox->notice_id = $this->id;
$inbox->delete(); $inbox->delete();
}
return; return;
} }