upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-26 19:32:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 37

fix: fix UserHomeSetupListener disabling with nested events

Browse source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2026-04-10 20:03:11 +02:00
parent fae8add994
commit a77f8ca38c
No known key found for this signature in database
GPG key ID: 42B69D8A64526EFB
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/files_sharing/lib/Listener/SharesUpdatedListener.php
View file

@ -61,7 +61,7 @@ class SharesUpdatedListener implements IEventListener {
public function handle(Event $event): void {
// don't trigger the on-setup checks if this handler triggers an fs setup
$this->homeSetupListener->setDisabled(true);
$oldState = $this->homeSetupListener->setDisabled(true);
if ($event instanceof UserShareAccessUpdatedEvent) {
foreach ($event->getUsers() as $user) {
@ -111,7 +111,7 @@ class SharesUpdatedListener implements IEventListener {
}
}
$this->homeSetupListener->setDisabled(false);
$this->homeSetupListener->setDisabled($oldState);
}
private function markOrRun(IUser $user, callable $callback): void {

4
apps/files_sharing/lib/Listener/UserHomeSetupListener.php
View file

@ -30,8 +30,10 @@ class UserHomeSetupListener implements IEventListener {
) {
}
public function setDisabled(bool $disabled): void {
public function setDisabled(bool $disabled): bool {
$previous = $this->disabled;
$this->disabled = $disabled;
return $previous;
}
public function handle(Event $event): void {
if (!$event instanceof UserHomeSetupEvent) {