Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-16 19:35:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into release

Browse source
This commit is contained in:
Mike Macgirvin 2024-09-07 06:51:07 +10:00
commit 5ef1a66498
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/hubloc.php
View file

@ -129,12 +129,12 @@ function check_hublocs()
$interval = Config::Get('system', 'delivery_interval', 2);
$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(z_root())
);
$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(z_root())
);

2
src/Lib/Activity.php
View file

@ -5190,7 +5190,7 @@ class Activity
$actorId = new ActorId($url);
if ($actorId->getType() === ActorId::ACTORID_TYPE_DIDKEY) {
$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)
);
if ($query) {

3
src/Module/Communities.php
View file

@ -43,7 +43,8 @@ class Communities extends Controller
$r = q(
"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"
);
if ($r) {

2
version.php
View file

@ -1,2 +1,2 @@
<?php
define ('STD_VERSION', '24.09.04');
define ('STD_VERSION', '24.09.07');