mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-19 16:55:18 +00:00
Merge branch 'dev' into release
This commit is contained in:
commit
5ef1a66498
4 changed files with 6 additions and 5 deletions
|
@ -129,12 +129,12 @@ function check_hublocs()
|
||||||
$interval = Config::Get('system', 'delivery_interval', 2);
|
$interval = Config::Get('system', 'delivery_interval', 2);
|
||||||
|
|
||||||
$wrong_urls = q(
|
$wrong_urls = q(
|
||||||
"select hubloc_id from hubloc where hubloc_sitekey = '%s' and hubloc_url != '%s'",
|
"select hubloc_id from hubloc where hubloc_sitekey = '%s' and hubloc_url != '%s' and hubloc_network in ('zot6', 'nomad')",
|
||||||
dbesc($sitekey),
|
dbesc($sitekey),
|
||||||
dbesc(z_root())
|
dbesc(z_root())
|
||||||
);
|
);
|
||||||
$wrong_keys = q(
|
$wrong_keys = q(
|
||||||
"select hubloc_id from hubloc where hubloc_sitekey != '%s' and hubloc_url = '%s'",
|
"select hubloc_id from hubloc where hubloc_sitekey != '%s' and hubloc_url = '%s' and hubloc_network in ('zot6', 'nomad')",
|
||||||
dbesc($sitekey),
|
dbesc($sitekey),
|
||||||
dbesc(z_root())
|
dbesc(z_root())
|
||||||
);
|
);
|
||||||
|
|
|
@ -5190,7 +5190,7 @@ class Activity
|
||||||
$actorId = new ActorId($url);
|
$actorId = new ActorId($url);
|
||||||
if ($actorId->getType() === ActorId::ACTORID_TYPE_DIDKEY) {
|
if ($actorId->getType() === ActorId::ACTORID_TYPE_DIDKEY) {
|
||||||
$ekey = str_replace('did:key:', '', $actorId->getId());
|
$ekey = str_replace('did:key:', '', $actorId->getId());
|
||||||
$query = q("select * from xchan where epubkey = '%s'",
|
$query = q("select * from xchan where xchan_epubkey = '%s'",
|
||||||
dbesc($ekey)
|
dbesc($ekey)
|
||||||
);
|
);
|
||||||
if ($query) {
|
if ($query) {
|
||||||
|
|
|
@ -44,6 +44,7 @@ class Communities extends Controller
|
||||||
$r = q(
|
$r = q(
|
||||||
"select count(site_url) as total from site
|
"select count(site_url) as total from site
|
||||||
where site_flags != 256 and site_dead = 0 $sql_extra
|
where site_flags != 256 and site_dead = 0 $sql_extra
|
||||||
|
group by site_update
|
||||||
order by site_update desc"
|
order by site_update desc"
|
||||||
);
|
);
|
||||||
if ($r) {
|
if ($r) {
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
<?php
|
<?php
|
||||||
define ('STD_VERSION', '24.09.04');
|
define ('STD_VERSION', '24.09.07');
|
||||||
|
|
Loading…
Reference in a new issue