NB-Public/circles
14
0
Fork 0
mirror of https://github.com/netzbegruenung/circles.git synced 2024-05-14 09:06:06 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #750 from nextcloud/fix/noid/local-stays-local-2

Browse source 
local circles starts local
This commit is contained in:
Maxence Lange 2021-07-28 10:47:25 -01:00 committed by GitHub
parent cc4e395259 5abbec0139
commit aa40822225
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/FederatedItems/CircleConfig.php
View file

@ -90,6 +90,16 @@ class CircleConfig implements
}
}
if ($circle->isConfig(Circle::CFG_LOCAL, $config)
&& !$circle->isConfig(Circle::CFG_LOCAL)) {
$config -= Circle::CFG_LOCAL;
}
if (!$circle->isConfig(Circle::CFG_LOCAL, $config)
&& $circle->isConfig(Circle::CFG_LOCAL)) {
$config += Circle::CFG_LOCAL;
}
if (!$circle->isConfig(Circle::CFG_OPEN, $config)
&& $circle->isConfig(Circle::CFG_OPEN)
&& $circle->isConfig(Circle::CFG_REQUEST, $config)

3
lib/Model/Circle.php
View file

@ -157,8 +157,7 @@ class Circle extends ManagedModel implements IMemberships, IDeserializable, INC2
public static $DEF_CFG_CORE_FILTER = [
1,
2,
4,
4096
4
];
public static $DEF_CFG_SYSTEM_FILTER = [