diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-13 22:11:06 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-13 22:11:06 -0700 |
| commit | b3a785711cde52a3c03c0a0eb90ce4e9ce8d9059 (patch) | |
| tree | 3e903f0d2a9af6dd036bf1013c6abe0a1ebc085a /include/zot.php | |
| parent | 503b42029212a61ce4aefcf63eb2a865ee334619 (diff) | |
| download | volse-hubzilla-b3a785711cde52a3c03c0a0eb90ce4e9ce8d9059.tar.gz volse-hubzilla-b3a785711cde52a3c03c0a0eb90ce4e9ce8d9059.tar.bz2 volse-hubzilla-b3a785711cde52a3c03c0a0eb90ce4e9ce8d9059.zip | |
deprecate/remove json_decode_plus
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/zot.php b/include/zot.php index 0bf689742..d506e96fe 100644 --- a/include/zot.php +++ b/include/zot.php @@ -506,7 +506,7 @@ function zot_refresh($them, $channel = null, $force = false) { )); if(intval($permissions['view_stream'])) { - if(intval(get_pconfig($channel['channel_id'],'perms_limit','send_stream') & PERMS_PENDING) + if(intval(get_pconfig($channel['channel_id'],'perm_limits','send_stream') & PERMS_PENDING) || (! intval($new_connection[0]['abook_pending']))) Zotlabs\Daemon\Master::Summon(array('Onepoll',$new_connection[0]['abook_id'])); } @@ -1395,7 +1395,7 @@ function public_recips($msg) { } } - //logger('message: ' . print_r($msg['message'],true)); + // logger('message: ' . print_r($msg['message'],true)); if($include_sys && array_key_exists('public_scope',$msg['message']) && $msg['message']['public_scope'] === 'public') { $sys = get_sys_channel(); @@ -1881,9 +1881,9 @@ function remove_community_tag($sender, $arr, $uid) { $i = $r[0]; if($i['target']) - $i['target'] = json_decode_plus($i['target']); + $i['target'] = json_decode($i['target'],true); if($i['object']) - $i['object'] = json_decode_plus($i['object']); + $i['object'] = json_decode($i['object'],true); if(! ($i['target'] && $i['object'])) { logger('remove_community_tag: no target/object'); |