diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-10-12 12:13:44 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-10-12 12:13:44 +0200 |
| commit | cf547be1d6900d12719a9372cbc1a5d433d31863 (patch) | |
| tree | 03a525cf40905adafc21b0c4146e467bad288437 /Zotlabs/Module/Mail.php | |
| parent | 29617737ca2c03c800ebbe4701dc21cf9f25ce22 (diff) | |
| parent | 16da1a4e810889448eecbd13d68183a820bcebe2 (diff) | |
| download | volse-hubzilla-cf547be1d6900d12719a9372cbc1a5d433d31863.tar.gz volse-hubzilla-cf547be1d6900d12719a9372cbc1a5d433d31863.tar.bz2 volse-hubzilla-cf547be1d6900d12719a9372cbc1a5d433d31863.zip | |
Merge branch '1.14RC'
Diffstat (limited to 'Zotlabs/Module/Mail.php')
| -rw-r--r-- | Zotlabs/Module/Mail.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Mail.php b/Zotlabs/Module/Mail.php index 043c28078..a61b02cdf 100644 --- a/Zotlabs/Module/Mail.php +++ b/Zotlabs/Module/Mail.php @@ -60,7 +60,7 @@ class Mail extends \Zotlabs\Web\Controller { if($j['permissions']['data']) { $permissions = crypto_unencapsulate($j['permissions'],$channel['channel_prvkey']); if($permissions) - $permissions = json_decode($permissions); + $permissions = json_decode($permissions, true); logger('decrypted permissions: ' . print_r($permissions,true), LOGGER_DATA); } else @@ -332,7 +332,7 @@ class Mail extends \Zotlabs\Web\Controller { 'delete' => t('Delete message'), 'dreport' => t('Delivery report'), 'recall' => t('Recall message'), - 'can_recall' => (($channel['channel_hash'] == $message['from_xchan']) ? true : false), + 'can_recall' => (($channel['channel_hash'] == $message['from_xchan'] && get_account_techlevel() > 0) ? true : false), 'is_recalled' => (intval($message['mail_recalled']) ? t('Message has been recalled.') : ''), 'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'], 'c'), ); |