From ba33c51b8c97992c374861bece427ffa6a7b6d9a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 5 Sep 2016 10:31:19 +0200 Subject: json_decode() should return an array instead of an object at this place --- Zotlabs/Module/Mail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From 2226d708ba991011d66885fb6df8fd3c02ca1fec Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 5 Sep 2016 10:36:28 +0200 Subject: bump STD_VERSION due to possible js chaching issue with new jotnets implementation --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index ea3522dc7..21cd7e281 100755 --- a/boot.php +++ b/boot.php @@ -44,7 +44,7 @@ require_once('include/account.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '1.13' ); +define ( 'STD_VERSION', '1.13.1' ); define ( 'ZOT_REVISION', '1.1' ); define ( 'DB_UPDATE_VERSION', 1182 ); -- cgit v1.2.3