Branch: refs/heads/XWIKI-24371-lockeditmode Home: https://github.com/xwiki/xwiki-platform Commit: 7a2ac461aa43bef4c72c8e058e1ebda46a27dada https://github.com/xwiki/xwiki-platform/commit/7a2ac461aa43bef4c72c8e058e1eb... Author: Vincent Massol <[email protected]> Date: 2026-09-01 (Tue, 01 Sep 2026) Changed paths: M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/internal/edit/EditModeResolver.java M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/org/xwiki/doc/lock/LockContext.java M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/org/xwiki/internal/document/lock/DefaultLockContext.java M xwiki-platform-core/xwiki-platform-oldcore/src/test/java/org/xwiki/internal/document/lock/DefaultLockContextTest.java Log Message: ----------- XWIKI-24371: Skip the force edit lock confirmation when joining a realtime collaboration session with BlockNote * Stop failing with an IllegalArgumentException when the resolved edit mode is not one of the LockContext.EditMode values (e.g. the object editor), which made the edit action return a server error page for any document locked by someone else * Document that LockContext#getEditMode() returns null for such edit modes, which the existing unlock rules already handle Co-Authored-By: Claude Opus 5 (1M context) <[email protected]> To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications