harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

circular logic - we need the mailbox to find the last message so move the code block back where it was, and only set a direct mid if one was specified.

Browse Source
This commit is contained in:
zotlabs 2017-03-29 17:42:31 -07:00 committed by Mario Vavti
parent 5219c4a09a
commit 181d9a0777
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Zotlabs/Module/Mail.php
View File

@ -297,10 +297,8 @@ class Mail extends \Zotlabs\Web\Controller {
return $o; return $o;
} }
$last_message = private_messages_list(local_channel(), $mailbox, 0, 1); $direct_mid = 0;
$mid = ((argc() > 2) && (intval(argv(2)))) ? argv(2) : $last_message[0]['id'];
switch(argv(1)) { switch(argv(1)) {
case 'combined': case 'combined':
$mailbox = 'combined'; $mailbox = 'combined';
@ -317,10 +315,17 @@ class Mail extends \Zotlabs\Web\Controller {
// notifications direct to mail/nn // notifications direct to mail/nn
if(intval(argv(1))) if(intval(argv(1)))
$mid = intval(argv(1)); $direct_mid = intval(argv(1));
break; break;
} }
$last_message = private_messages_list(local_channel(), $mailbox, 0, 1);
$mid = ((argc() > 2) && (intval(argv(2)))) ? argv(2) : $last_message[0]['id'];
if($direct_mid)
$mid = $direct_mid;
$plaintext = true; $plaintext = true;