diff options
| author | mrjive <mrjive@mrjive.it> | 2018-01-16 11:45:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-16 11:45:01 +0100 |
| commit | e81949bb095448881ce83605a50454d0c3c40782 (patch) | |
| tree | bd15059a020152b5dc59c265e22a27251efe0de4 /include/channel.php | |
| parent | b4f8f4df7bc5cc8a74240506cd536224cb31e114 (diff) | |
| parent | 9aadcb0bd40a8f773dc164f7dadc8c238fff9954 (diff) | |
| download | volse-hubzilla-e81949bb095448881ce83605a50454d0c3c40782.tar.gz volse-hubzilla-e81949bb095448881ce83605a50454d0c3c40782.tar.bz2 volse-hubzilla-e81949bb095448881ce83605a50454d0c3c40782.zip | |
Merge pull request #7 from redmatrix/dev
Dev
Diffstat (limited to 'include/channel.php')
| -rw-r--r-- | include/channel.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/include/channel.php b/include/channel.php index 708e74176..b9adc588b 100644 --- a/include/channel.php +++ b/include/channel.php @@ -325,7 +325,7 @@ function create_identity($arr) { 'hubloc_guid_sig' => $sig, 'hubloc_hash' => $hash, 'hubloc_addr' => channel_reddress($ret['channel']), - 'hubloc_primary' => $primary, + 'hubloc_primary' => intval($primary), 'hubloc_url' => z_root(), 'hubloc_url_sig' => base64url_encode(rsa_sign(z_root(),$ret['channel']['channel_prvkey'])), 'hubloc_host' => App::get_hostname(), @@ -1490,7 +1490,7 @@ function gender_icon($gender) { } -function advanced_profile(&$a) { +function advanced_profile() { require_once('include/text.php'); if(! perm_is_allowed(App::$profile['profile_uid'],get_observer_hash(),'view_profile')) return ''; @@ -1982,12 +1982,17 @@ function get_channel_default_perms($uid) { } -function profiles_build_sync($channel_id) { +function profiles_build_sync($channel_id,$send = true) { $r = q("select * from profile where uid = %d", intval($channel_id) ); if($r) { - build_sync_packet($channel_id,array('profile' => $r)); + if($send) { + build_sync_packet($channel_id,array('profile' => $r)); + } + else { + return $r; + } } } |