Merge branch 'dev' into release

This commit is contained in:
Mike Macgirvin 2024-09-17 07:46:55 +10:00
commit f7c4df9c0b
2 changed files with 3 additions and 3 deletions

View file

@ -227,7 +227,7 @@ class ActivityPub
if (!in_array($x['recipient']['xchan_network'], ['activitypub', 'apnomadic'])) {
return;
}
$collections = XConfig::Get($x['recipient']['xchan_hash'], 'system', 'collections', []);
$collections = XConfig::Get($x['recipient']['xchan_hash'], 'activitypub', 'collections', []);
if ($collections) {
$their_perms = Activity::getPermissions($collections, $x['sender']);
if ($their_perms) {
@ -252,7 +252,7 @@ class ActivityPub
return;
}
$collections = XConfig::Get($x['recipient']['xchan_hash'], 'system', 'collections', []);
$collections = XConfig::Get($x['recipient']['xchan_hash'], 'activitypub', 'collections', []);
if ($collections) {
$their_perms = Activity::getPermissions($collections, $x['sender']);
if ($their_perms) {

View file

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