aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-10-08 18:18:44 +0000
committerMario <mario@mariovavti.com>2020-10-08 18:18:44 +0000
commitad51be7dd9446b1338f2e140a479a497f56820f3 (patch)
tree9416dfe42f48046d6e410d6565b81e3ea06438c7 /include
parent3514f805ea93619cb7ea14961974b4d61c36d17d (diff)
downloadvolse-hubzilla-ad51be7dd9446b1338f2e140a479a497f56820f3.tar.gz
volse-hubzilla-ad51be7dd9446b1338f2e140a479a497f56820f3.tar.bz2
volse-hubzilla-ad51be7dd9446b1338f2e140a479a497f56820f3.zip
reduce result set for query in zid_init() and use Libzot::zot_record_preferred() in mod rmagic
Diffstat (limited to 'include')
-rw-r--r--include/channel.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/channel.php b/include/channel.php
index a51404652..ccec4f9ee 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -1925,7 +1925,7 @@ function zid_init() {
call_hooks('zid_init', $arr);
if(! local_channel()) {
- $r = q("select * from hubloc where hubloc_addr = '%s' order by hubloc_connected desc",
+ $r = q("select hubloc_url, hubloc_hash, hubloc_network from hubloc where hubloc_addr = '%s' order by hubloc_connected desc",
dbesc($tmp_str)
);
if(! $r) {
@@ -1934,6 +1934,7 @@ function zid_init() {
if($r) {
$r = Libzot::zot_record_preferred($r);
}
+
if($r && remote_channel() && remote_channel() === $r['hubloc_hash'])
return;