diff options
| author | Mario <mario@mariovavti.com> | 2019-06-15 23:07:39 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-06-15 23:07:39 +0200 |
| commit | 3bc214e5449c7ce190a35ae6e70a1fb7ebe84962 (patch) | |
| tree | 2687f7ec477ab98c2488d430ffcf79731a85e198 /include/items.php | |
| parent | a26774b99e1cf3e69df4f527e2c4c4443dce63ad (diff) | |
| parent | 43cec4398d0d035dd9446988134b814513a73080 (diff) | |
| download | volse-hubzilla-3bc214e5449c7ce190a35ae6e70a1fb7ebe84962.tar.gz volse-hubzilla-3bc214e5449c7ce190a35ae6e70a1fb7ebe84962.tar.bz2 volse-hubzilla-3bc214e5449c7ce190a35ae6e70a1fb7ebe84962.zip | |
Merge branch 'dev' into 'dev'
Add signatures processing for private messages
See merge request hubzilla/core!1670
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/items.php b/include/items.php index 9ceb91519..0af119cc9 100755 --- a/include/items.php +++ b/include/items.php @@ -1457,6 +1457,7 @@ function encode_mail($item,$extended = false) { $x['to'] = encode_item_xchan($item['to']); $x['raw'] = $item['mail_raw']; $x['mimetype'] = $item['mail_mimetype']; + $x['sig'] = $item['sig']; if($item['attach']) $x['attach'] = json_decode($item['attach'],true); @@ -1516,6 +1517,9 @@ function get_mail_elements($x) { $arr['expires'] = datetime_convert('UTC','UTC',$x['expires']); $arr['mail_flags'] = 0; + + if(array_key_exists('sig',$x)) + $arr['sig'] = $x['sig']; if($x['flags'] && is_array($x['flags'])) { if(in_array('recalled',$x['flags'])) { |