diff options
| author | Mario <mario@mariovavti.com> | 2021-05-26 12:18:59 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-05-26 12:18:59 +0000 |
| commit | 1fa4bc9ac024983d4748262f98c6ddf323ad327c (patch) | |
| tree | 807e3253255a8a24ded4ff81dd9313b37fb6e4cb /Zotlabs/Lib | |
| parent | b742910107720797b05ec69ae626b420699e0630 (diff) | |
| download | volse-hubzilla-1fa4bc9ac024983d4748262f98c6ddf323ad327c.tar.gz volse-hubzilla-1fa4bc9ac024983d4748262f98c6ddf323ad327c.tar.bz2 volse-hubzilla-1fa4bc9ac024983d4748262f98c6ddf323ad327c.zip | |
remove most legacy zot quirks
Diffstat (limited to 'Zotlabs/Lib')
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Lib/Apps.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Lib/Connect.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 6e8344def..500e99ee8 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -3496,7 +3496,7 @@ class Activity { static function find_best_identity($xchan) { if (filter_var($xchan, FILTER_VALIDATE_URL)) { - $r = q("select hubloc_hash, hubloc_network from hubloc where hubloc_id_url = '%s' and hubloc_network in ('zot6', 'zot') and hubloc_deleted = 0", + $r = q("select hubloc_hash, hubloc_network from hubloc where hubloc_id_url = '%s' and hubloc_network = 'zot6' and hubloc_deleted = 0", dbesc($xchan) ); if ($r) { diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index 5ef4ecc8d..bd51f0896 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -524,7 +524,7 @@ class Apps { } elseif(remote_channel()) { $observer = \App::get_observer(); - if($observer && in_array($observer['xchan_network'], ['zot6', 'zot'])) { + if($observer && $observer['xchan_network'] === 'zot6') { // some folks might have xchan_url redirected offsite, use the connurl $x = parse_url($observer['xchan_connurl']); if($x) { diff --git a/Zotlabs/Lib/Connect.php b/Zotlabs/Lib/Connect.php index 21bec171b..38fe69995 100644 --- a/Zotlabs/Lib/Connect.php +++ b/Zotlabs/Lib/Connect.php @@ -146,7 +146,7 @@ class Connect { } - $allowed = ((in_array($xchan['xchan_network'],['rss','zot','zot6'])) ? 1 : 0); + $allowed = ((in_array($xchan['xchan_network'],['rss', 'zot6'])) ? 1 : 0); $hookdata = ['channel_id' => $uid, 'follow_address' => $url, 'xchan' => $xchan, 'allowed' => $allowed, 'singleton' => 0]; call_hooks('follow_allow',$hookdata); |