aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-09-05 10:31:19 +0200
committerMario Vavti <mario@mariovavti.com>2016-09-05 10:31:19 +0200
commitba33c51b8c97992c374861bece427ffa6a7b6d9a (patch)
treea04314ce4676bc2d959e4c79a3998f6bb6b80818 /Zotlabs/Module
parentaaa7d6a0ecb5b4b86acfe03155affc538f450fb5 (diff)
downloadvolse-hubzilla-ba33c51b8c97992c374861bece427ffa6a7b6d9a.tar.gz
volse-hubzilla-ba33c51b8c97992c374861bece427ffa6a7b6d9a.tar.bz2
volse-hubzilla-ba33c51b8c97992c374861bece427ffa6a7b6d9a.zip
json_decode() should return an array instead of an object at this place
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Mail.php2
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