Merge pull request #4 from YesWiki/fix-group-sync

Fix group config invalid on user group suppression
YesWiki · Apr 10, 2024 · 87c8ff3 · 87c8ff3
2 parents 69e3670 + 88affa2
commit 87c8ff3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ Allow initial for username generation when username in PascalCase or camelCase
 ## V1.1.1
 
 Allow display initials instead of username on login modal
+Fix group config invalid on user group suppression
 
 ## V1.1.0
 

diff --git a/services/UserSSOGroupSync.php b/services/UserSSOGroupSync.php
@@ -49,7 +49,7 @@ public function syncSsoGroups(User $user, $ssoGroups, $ssoGroupMapping)
         foreach (array_diff($userGroups, $ssoGroups) as $groupToRemove) {
             $groupAcl = $this->wiki->GetGroupACL($groupToRemove) ?? '';
             $groupAcl = str_replace($user->getName(), '', $groupAcl);
-            $groupAcl = str_replace(PHP_EOL . PHP_EOL, '', $groupAcl);
+            $groupAcl = str_replace(PHP_EOL . PHP_EOL, PHP_EOL, $groupAcl);
             $this->updateGroupAcl($groupToRemove, trim($groupAcl));
         }