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

when clicking a notification to view a private mail message, actually view that message instead of the most recent.

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

11
Zotlabs/Module/Mail.php
View File

@ -296,6 +296,10 @@ class Mail extends \Zotlabs\Web\Controller {
return $o; return $o;
} }
$last_message = private_messages_list(local_channel(), $mailbox, 0, 1);
$mid = ((argc() > 2) && (intval(argv(2)))) ? argv(2) : $last_message[0]['id'];
switch(argv(1)) { switch(argv(1)) {
case 'combined': case 'combined':
@ -309,12 +313,15 @@ class Mail extends \Zotlabs\Web\Controller {
break; break;
default: default:
$mailbox = 'combined'; $mailbox = 'combined';
// notifications direct to mail/nn
if(intval(argv(1)))
$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'];
$plaintext = true; $plaintext = true;