diff options
| author | zotlabs <mike@macgirvin.com> | 2018-02-05 15:58:28 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-02-05 15:58:28 -0800 |
| commit | b41c5f349715abc6ca7db563e3938336bc75974e (patch) | |
| tree | 31a1ee5a74227c30239bb9d2a10341bbacb8ecec /Zotlabs/Module/Connedit.php | |
| parent | 05de59d4ad174cb106c3a5b5890732af51730384 (diff) | |
| parent | 930e1fdbdc798868760f8a4e03f32fc3f42e8bc9 (diff) | |
| download | volse-hubzilla-b41c5f349715abc6ca7db563e3938336bc75974e.tar.gz volse-hubzilla-b41c5f349715abc6ca7db563e3938336bc75974e.tar.bz2 volse-hubzilla-b41c5f349715abc6ca7db563e3938336bc75974e.zip | |
Merge branch 'master' into z6
Diffstat (limited to 'Zotlabs/Module/Connedit.php')
| -rw-r--r-- | Zotlabs/Module/Connedit.php | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index 8288886cd..e23a751d9 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -826,27 +826,10 @@ class Connedit extends \Zotlabs\Web\Controller { } } - $locstr = ''; - - $locs = q("select hubloc_addr as location from hubloc left join site on hubloc_url = site_url where hubloc_hash = '%s' - and hubloc_deleted = 0 and site_dead = 0", - dbesc($contact['xchan_hash']) - ); - - if($locs) { - foreach($locs as $l) { - if(!($l['location'])) - continue; - if(strpos($locstr,$l['location']) !== false) - continue; - if(strlen($locstr)) - $locstr .= ', '; - $locstr .= $l['location']; - } - } - else + $locstr = locations_by_netid($contact['xchan_hash']); + if(! $locstr) $locstr = $contact['xchan_url']; - + $clone_warn = ''; $clonable = (in_array($contact['xchan_network'],['zot','rss']) ? true : false); if(! $clonable) { |