aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-03-29 17:42:31 -0700
committerMario Vavti <mario@mariovavti.com>2017-03-30 11:54:21 +0200
commit181d9a07778486594d2d735c36bd1943fefa3c46 (patch)
tree8af093ce05b4751e8114eeba08104d2be5217613
parent5219c4a09ae3ffe3f91abf7d6f58fb8eeb4a116e (diff)
downloadvolse-hubzilla-181d9a07778486594d2d735c36bd1943fefa3c46.tar.gz
volse-hubzilla-181d9a07778486594d2d735c36bd1943fefa3c46.tar.bz2
volse-hubzilla-181d9a07778486594d2d735c36bd1943fefa3c46.zip
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.
-rw-r--r--Zotlabs/Module/Mail.php13
1 files changed, 9 insertions, 4 deletions
diff --git a/Zotlabs/Module/Mail.php b/Zotlabs/Module/Mail.php
index 53303816b..2fb89fed5 100644
--- a/Zotlabs/Module/Mail.php
+++ b/Zotlabs/Module/Mail.php
@@ -297,10 +297,8 @@ class Mail extends \Zotlabs\Web\Controller {
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)) {
case 'combined':
$mailbox = 'combined';
@@ -317,10 +315,17 @@ class Mail extends \Zotlabs\Web\Controller {
// notifications direct to mail/nn
if(intval(argv(1)))
- $mid = intval(argv(1));
+ $direct_mid = intval(argv(1));
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;