aboutsummaryrefslogtreecommitdiffstats
path: root/mod/mail.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-23 21:01:59 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-23 21:01:59 -0700
commit1a0655f34ea9979c7a08d21344d3e0eb9eb3246d (patch)
tree5dde4224a3c762bcc1935b2e67464939e57a60d2 /mod/mail.php
parentcb76fb8b9b659c4ec06e359f375a35a534927b99 (diff)
downloadvolse-hubzilla-1a0655f34ea9979c7a08d21344d3e0eb9eb3246d.tar.gz
volse-hubzilla-1a0655f34ea9979c7a08d21344d3e0eb9eb3246d.tar.bz2
volse-hubzilla-1a0655f34ea9979c7a08d21344d3e0eb9eb3246d.zip
more work on mail flags
Diffstat (limited to 'mod/mail.php')
-rw-r--r--mod/mail.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/mod/mail.php b/mod/mail.php
index 1b0ea17c4..152db3231 100644
--- a/mod/mail.php
+++ b/mod/mail.php
@@ -145,8 +145,7 @@ function mail_content(&$a) {
if(! intval(argv(2)))
return;
$cmd = argv(1);
- $r = q("update mail set mail_flags = mail_flags | %d where id = %d and channel_id = %d",
- intval(MAIL_RECALLED),
+ $r = q("update mail set mail_recalled = 1 where id = %d and channel_id = %d",
intval(argv(2)),
intval(local_channel())
);
@@ -312,7 +311,7 @@ function mail_content(&$a) {
'delete' => t('Delete message'),
'recall' => t('Recall message'),
'can_recall' => (($channel['channel_hash'] == $message['from_xchan']) ? true : false),
- 'is_recalled' => (($message['mail_flags'] & MAIL_RECALLED) ? t('Message has been recalled.') : ''),
+ 'is_recalled' => (intval($message['mail_recalled']) ? t('Message has been recalled.') : ''),
'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A'),
);