GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

UserEmailSummaryHandler: Update notice-fetching logic

Browse Source 
InboxNoticeStream::getNotices() no longer returns an ArrayWrapper;
just fetch notices normally via $notice->fetch(), so that
we can actually get the top notice-ID and update email_summary_status
accordingly--and not mail about the same notices repeatedly.
This commit is contained in:
Joshua Judson Rosen 2014-11-23 23:03:14 -05:00
parent 2f506dde28
commit bf0f22744d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/EmailSummary/lib/useremailsummaryhandler.php
View File

@ -117,8 +117,8 @@ class UserEmailSummaryHandler extends QueueHandler
$new_top = null;
if ($notice instanceof ArrayWrapper) {
$new_top = $notice->_items[0]->id;
if ($notice->fetch()) {
$new_top = $notice->id;
}
// TRANS: Subject for e-mail.
@ -145,7 +145,7 @@ class UserEmailSummaryHandler extends QueueHandler
$out->elementStart('table', array('width' => '550px',
'style' => 'border: none; border-collapse: collapse;', 'cellpadding' => '6'));
while ($notice->fetch()) {
do {
$profile = Profile::getKV('id', $notice->profile_id);
if (empty($profile)) {
@ -189,7 +189,7 @@ class UserEmailSummaryHandler extends QueueHandler
$out->elementEnd('div');
$out->elementEnd('td');
$out->elementEnd('tr');
}
} while ($notice->fetch());
$out->elementEnd('table');