aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2022-09-28 10:27:58 +0000
committerMario <mario@mariovavti.com>2022-09-28 10:27:58 +0000
commitc49d1547c423ec1d62acd7440c268b508f5d58a8 (patch)
tree545a384a1a5ce78ba799a47d2f2acc4cdfe8d04b
parentb3f70140e522f5eba8a4931adcc0ef520b432f47 (diff)
parentad35363c2e2ea30707cbea4796a03b88abde380e (diff)
downloadvolse-hubzilla-c49d1547c423ec1d62acd7440c268b508f5d58a8.tar.gz
volse-hubzilla-c49d1547c423ec1d62acd7440c268b508f5d58a8.tar.bz2
volse-hubzilla-c49d1547c423ec1d62acd7440c268b508f5d58a8.zip
Merge branch 'dev' into 7.8RC
-rw-r--r--Zotlabs/Lib/Libzot.php6
-rw-r--r--Zotlabs/Module/Channel.php2
2 files changed, 4 insertions, 4 deletions
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php
index 84fccd18f..607eadb07 100644
--- a/Zotlabs/Lib/Libzot.php
+++ b/Zotlabs/Lib/Libzot.php
@@ -1233,7 +1233,7 @@ class Libzot {
return;
}
- $r = q("select hubloc_hash, hubloc_network, hubloc_url from hubloc where hubloc_id_url = '%s'",
+ $r = q("select hubloc_hash, hubloc_network, hubloc_url from hubloc where hubloc_id_url = '%s' order by hubloc_id desc",
dbesc($AS->actor['id'])
);
@@ -1241,7 +1241,7 @@ class Libzot {
// Author is unknown to this site. Perform channel discovery and try again.
$z = discover_by_webbie($AS->actor['id']);
if ($z) {
- $r = q("select hubloc_hash, hubloc_network, hubloc_url from hubloc where hubloc_id_url = '%s'",
+ $r = q("select hubloc_hash, hubloc_network, hubloc_url from hubloc where hubloc_id_url = '%s' order by hubloc_id desc",
dbesc($AS->actor['id'])
);
}
@@ -2738,7 +2738,7 @@ class Libzot {
$ztarget_hash = EMPTY_STR;
if ($ztarget) {
- $t = q("select * from hubloc where hubloc_id_url = '%s' and hubloc_network = 'zot6' limit 1",
+ $t = q("select * from hubloc where hubloc_id_url = '%s' and hubloc_network = 'zot6' order by hubloc_id desc limit 1",
dbesc($ztarget)
);
if ($t) {
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index 7ffc7cfb0..24a3fd44f 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -67,7 +67,7 @@ class Channel extends Controller {
if ($sigdata && $sigdata['signer'] && $sigdata['header_valid']) {
$data = json_encode(Libzot::zotinfo(['guid_hash' => $channel['channel_hash'], 'target_url' => $sigdata['signer']]));
- $s = q("select site_crypto, hubloc_sitekey from site left join hubloc on hubloc_url = site_url where hubloc_id_url = '%s' and hubloc_network = 'zot6' limit 1",
+ $s = q("select site_crypto, hubloc_sitekey from site left join hubloc on hubloc_url = site_url where hubloc_id_url = '%s' and hubloc_network = 'zot6' order by hubloc_id desc limit 1",
dbesc($sigdata['signer'])
);