aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-04-22 07:44:51 +0000
committerMario <mario@mariovavti.com>2020-04-22 07:44:51 +0000
commitb1b9dbe55f4cc0740b113514085da52f290853ee (patch)
tree2a29d00dc0392ce1756afe5e8a54f58aa8a97115 /include
parent579adb48978172ae26f8cb1c724b8b17a6a37b34 (diff)
downloadvolse-hubzilla-b1b9dbe55f4cc0740b113514085da52f290853ee.tar.gz
volse-hubzilla-b1b9dbe55f4cc0740b113514085da52f290853ee.tar.bz2
volse-hubzilla-b1b9dbe55f4cc0740b113514085da52f290853ee.zip
more prefer zot6 over zot
Diffstat (limited to 'include')
-rw-r--r--include/channel.php2
-rw-r--r--include/zid.php5
2 files changed, 3 insertions, 4 deletions
diff --git a/include/channel.php b/include/channel.php
index be58f154a..742d9e3a7 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -1930,7 +1930,7 @@ function zid_init() {
Master::Summon(array('Gprobe',bin2hex($tmp_str)));
}
if($r) {
- $r = zot_record_preferred($r);
+ $r = Libzot::zot_record_preferred($r);
}
if($r && remote_channel() && remote_channel() === $r['hubloc_hash'])
return;
diff --git a/include/zid.php b/include/zid.php
index 325af5580..10e09e212 100644
--- a/include/zid.php
+++ b/include/zid.php
@@ -1,5 +1,6 @@
<?php
+use Zotlabs\Lib\Libzot;
use Zotlabs\Lib\Verify;
use Zotlabs\Zot\Finger;
@@ -402,9 +403,7 @@ function observer_auth($ob_hash) {
return;
}
- // Note: this has no Libzot namespace so prefers zot over zot6
-
- $hubloc = zot_record_preferred($r);
+ $hubloc = Libzot::zot_record_preferred($r);
$_SESSION['authenticated'] = 1;