harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor weirdness in zot finger results after deleting a clone from a channel that was on a site which was previously migrated from http to https and still had the old hubloc

Browse Source
This commit is contained in:
zotlabs 2017-06-28 18:28:02 -07:00
parent 798a03c2ab
commit 8ca5a65dcf
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/zot.php
View File

@ -3929,6 +3929,7 @@ function zotinfo($arr) {
$ret['photo_updated'] = $e['xchan_photo_date']; $ret['photo_updated'] = $e['xchan_photo_date'];
$ret['url'] = $e['xchan_url']; $ret['url'] = $e['xchan_url'];
$ret['connections_url']= (($e['xchan_connurl']) ? $e['xchan_connurl'] : z_root() . '/poco/' . $e['channel_address']); $ret['connections_url']= (($e['xchan_connurl']) ? $e['xchan_connurl'] : z_root() . '/poco/' . $e['channel_address']);
$ret['follow_url'] = $e['xchan_follow'];
$ret['target'] = $ztarget; $ret['target'] = $ztarget;
$ret['target_sig'] = $zsig; $ret['target_sig'] = $zsig;
$ret['searchable'] = $searchable; $ret['searchable'] = $searchable;
@ -3936,20 +3937,23 @@ function zotinfo($arr) {
$ret['public_forum'] = $public_forum; $ret['public_forum'] = $public_forum;
if($deleted) if($deleted)
$ret['deleted'] = $deleted; $ret['deleted'] = $deleted;
if(intval($e['channel_removed'])) if(intval($e['channel_removed']))
$ret['deleted_locally'] = true; $ret['deleted_locally'] = true;
// premium or other channel desiring some contact with potential followers before connecting. // premium or other channel desiring some contact with potential followers before connecting.
// This is a template - %s will be replaced with the follow_url we discover for the return channel. // This is a template - %s will be replaced with the follow_url we discover for the return channel.
if($special_channel) if($special_channel) {
$ret['connect_url'] = z_root() . '/connect/' . $e['channel_address']; $ret['connect_url'] = (($e['xchan_connpage']) ? $e['xchan_connpage'] : z_root() . '/connect/' . $e['channel_address']);
}
// This is a template for our follow url, %s will be replaced with a webbie // This is a template for our follow url, %s will be replaced with a webbie
if(! $ret['follow_url'])
$ret['follow_url'] = z_root() . '/follow?f=&url=%s'; $ret['follow_url'] = z_root() . '/follow?f=&url=%s';
$permissions = get_all_perms($e['channel_id'],$ztarget_hash,false); $permissions = get_all_perms($e['channel_id'],$ztarget_hash,false);
if($ztarget_hash) { if($ztarget_hash) {