diff options
| author | redmatrix <mike@macgirvin.com> | 2016-09-05 17:10:31 -0700 |
|---|---|---|
| committer | redmatrix <mike@macgirvin.com> | 2016-09-05 17:10:31 -0700 |
| commit | d7d46def9d6893b239c4e4e468fe151cedb28477 (patch) | |
| tree | ae28edab8245b00480bf0c3c809592db19484839 /Zotlabs/Module | |
| parent | 1639f5b83d39be33ccbf07ac29b7a86cc11a4d14 (diff) | |
| parent | 2226d708ba991011d66885fb6df8fd3c02ca1fec (diff) | |
| download | volse-hubzilla-d7d46def9d6893b239c4e4e468fe151cedb28477.tar.gz volse-hubzilla-d7d46def9d6893b239c4e4e468fe151cedb28477.tar.bz2 volse-hubzilla-d7d46def9d6893b239c4e4e468fe151cedb28477.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Mail.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Mail.php b/Zotlabs/Module/Mail.php index 933739b74..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 |