Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable28] fix: Allow to unlock based on the current lock not the requested one to allow lock owners to unlock in any case #255

Merged
merged 1 commit into from
Mar 21, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/Service/LockService.php
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ public function canUnlock(LockContext $request, FileLock $current): void {
$isSameType = $request->getType() === $current->getType();

// Check the token for token based locks
if ($request->getType() === ILock::TYPE_TOKEN) {
if ($current->getType() === ILock::TYPE_TOKEN) {
if ($isSameToken || ($this->allowUserOverride && $isSameUser)) {
return;
}
Expand Down
Loading