diff options
| author | marijus <mario@mariovavti.com> | 2014-08-24 09:35:21 +0200 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-08-24 09:35:21 +0200 |
| commit | f991ca8df127dd90e12c00b5d39e22603e4e425a (patch) | |
| tree | 68518e3c2b71ba9d7cb1ebfa06a4484f3d1e5bcd /mod/zfinger.php | |
| parent | 8d382a9394a1b3b32fcd40553add9520e076ab68 (diff) | |
| parent | 9b524c9bc4553a82b98f46e4c4804d76ee1495f2 (diff) | |
| download | volse-hubzilla-f991ca8df127dd90e12c00b5d39e22603e4e425a.tar.gz volse-hubzilla-f991ca8df127dd90e12c00b5d39e22603e4e425a.tar.bz2 volse-hubzilla-f991ca8df127dd90e12c00b5d39e22603e4e425a.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'mod/zfinger.php')
| -rw-r--r-- | mod/zfinger.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/zfinger.php b/mod/zfinger.php index cf8a3fda1..ef55085d6 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -203,7 +203,7 @@ function zfinger_init(&$a) { $permissions['connected'] = true; } - $ret['permissions'] = (($ztarget && $zkey) ? aes_encapsulate(json_encode($permissions),$zkey) : $permissions); + $ret['permissions'] = (($ztarget && $zkey) ? crypto_encapsulate(json_encode($permissions),$zkey) : $permissions); if($permissions['view_profile']) $ret['profile'] = $profile; |