diff options
| author | Mario <mario@mariovavti.com> | 2019-03-21 09:46:36 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-03-21 09:46:36 +0100 |
| commit | f220628354013233e2fc22939767b2b5597f87c6 (patch) | |
| tree | a98052ba10094428865abcad85fcfdec83844b65 /include | |
| parent | 322bc5dc87cebeeae470e11f011d363520ac4ed2 (diff) | |
| parent | 75c3bda8665b78b9a44863b87c08d4f9e8a5b547 (diff) | |
| download | volse-hubzilla-f220628354013233e2fc22939767b2b5597f87c6.tar.gz volse-hubzilla-f220628354013233e2fc22939767b2b5597f87c6.tar.bz2 volse-hubzilla-f220628354013233e2fc22939767b2b5597f87c6.zip | |
Merge branch 'dev' into 'dev'
hubzilla core issue #1356 , permissions not getting decrypted on follow
See merge request hubzilla/core!1563
Diffstat (limited to 'include')
| -rw-r--r-- | include/follow.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/follow.php b/include/follow.php index db77a0160..1b35f1b32 100644 --- a/include/follow.php +++ b/include/follow.php @@ -119,6 +119,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) if( array_key_exists('permissions',$j) && array_key_exists('data',$j['permissions'])) { $permissions = crypto_unencapsulate(array( 'data' => $j['permissions']['data'], + 'alg' => $j['permissions']['alg'], 'key' => $j['permissions']['key'], 'iv' => $j['permissions']['iv']), $channel['channel_prvkey']); |