Merge remote-tracking branch 'mike/master' into dev
This commit is contained in:
commit
48e74035f2
@ -204,7 +204,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
|
|||||||
$singleton = intval($x['singleton']);
|
$singleton = intval($x['singleton']);
|
||||||
|
|
||||||
$aid = $channel['channel_account_id'];
|
$aid = $channel['channel_account_id'];
|
||||||
$hash = get_observer_hash();
|
$hash = $channel['channel_hash'];
|
||||||
$default_group = $channel['channel_default_group'];
|
$default_group = $channel['channel_default_group'];
|
||||||
|
|
||||||
if($hash == $xchan_hash) {
|
if($hash == $xchan_hash) {
|
||||||
|
Reference in New Issue
Block a user