mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-19 16:35:19 +00:00
Merge branch 'dev' into release
This commit is contained in:
commit
f7c4df9c0b
2 changed files with 3 additions and 3 deletions
|
@ -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) {
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
<?php
|
||||
define ('STD_VERSION', '24.09.16');
|
||||
define ('STD_VERSION', '24.09.17');
|
||||
|
|
Loading…
Reference in a new issue