Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 01:55: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-16 06:45:03 +10:00
commit 3141bb6155
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/hubloc.php
View file

@ -87,7 +87,7 @@ function prune_hub_reinstalls()
{
$r = q(
"select site_url from site where site_type = %d && site_url != '%s'",
"select site_url from site where site_type = %d and site_url != '%s'",
intval(SITE_TYPE_ZOT),
dbesc(z_root())
);

2
src/Lib/Activity.php
View file

@ -2247,7 +2247,7 @@ class Activity
// The xchan should have been created by actor_store() above
$r = q(
"select * from xchan where xchan_hash = '%s' and xchan_network = 'activitypub' limit 1",
"select * from xchan where xchan_hash = '%s' and xchan_network in ('activitypub', 'apnomadic') limit 1",
dbesc($actorId->getId())
);

4
src/Module/Import.php
View file

@ -194,14 +194,14 @@ class Import extends Controller
$eprvkey = $multibase->decode($data['privateKeyMultibase']);
if ($epubkey && $eprvkey) {
$existing = q("select * from channel where epubkey = '%s'",
$existing = q("select * from channel where channel_epubkey = '%s'",
dbesc($epubkey)
);
if ($existing) {
notice(t('Identity key is already being used on this instance.'));
return;
}
q("update channel set epubkey = '%s', eprivkey = '%s' where channel_id = %d",
q("update channel set channel_epubkey = '%s', eprivkey = '%s' where channel_id = %d",
dbesc($epubkey),
dbesc($eprvkey),
intval($channel['channel_id'])

2
src/Update/_1271.php
View file

@ -47,7 +47,7 @@ class _1271
public function verify()
{
$columns = db_columns('channel');
return in_array('epubkey', $columns) && in_array('eprvkey', $columns);
return in_array('channel_epubkey', $columns) && in_array('channel_eprvkey', $columns);
}
}

2
version.php
View file

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