Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-29 03:04:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix ACLFormatterTest

Browse source 
- Add nullable to expand() function again
- Add angle bracket support to toString()
This commit is contained in:
Philipp Holzer 2019-11-01 14:13:29 +01:00
parent bc18cde412
commit aa7be41728
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
6 changed files with 51 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Worker/Notifier.php
View file

@ -279,10 +279,10 @@ class Notifier
/** @var ACLFormatter $aclFormatter */
$aclFormatter = BaseObject::getClass(ACLFormatter::class);
$allow_people = $aclFormatter->expand($parent['allow_cid'] ?? '');
$allow_groups = Group::expand($uid, $aclFormatter->expand($parent['allow_gid'] ?? ''),true);
$deny_people = $aclFormatter->expand($parent['deny_cid'] ?? '');
$deny_groups = Group::expand($uid, $aclFormatter->expand($parent['deny_gid'] ?? ''));
$allow_people = $aclFormatter->expand($parent['allow_cid']);
$allow_groups = Group::expand($uid, $aclFormatter->expand($parent['allow_gid']),true);
$deny_people = $aclFormatter->expand($parent['deny_cid']);
$deny_groups = Group::expand($uid, $aclFormatter->expand($parent['deny_gid']));
// if our parent is a public forum (forum_mode == 1), uplink to the origional author causing
// a delivery fork. private groups (forum_mode == 2) do not uplink