diff --git a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-default/src/main/java/org/xwiki/edit/internal/EditorWikiComponent.java b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-default/src/main/java/org/xwiki/edit/internal/EditorWikiComponent.java index 656fd37ef11b1cd6d9c6234b2775938ee9a965ec..8d9c46b4b720a984ff3dcd2e7a5b28e1c0505dcb 100644 --- a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-default/src/main/java/org/xwiki/edit/internal/EditorWikiComponent.java +++ b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-default/src/main/java/org/xwiki/edit/internal/EditorWikiComponent.java @@ -136,9 +136,9 @@ public EditorDescriptor getDescriptor() @Override protected String render() throws EditException { - XWikiContext xcontext = this.xcontextProvider.get(); - XWikiDocument previousSecurityDocument = (XWikiDocument) xcontext.get(SECURITY_DOCUMENT); try { + XWikiContext xcontext = this.xcontextProvider.get(); + XWikiDocument editorDocument = xcontext.getWiki().getDocument(this.getDocumentReference(), xcontext); BaseObject editorObject = editorDocument.getXObject(EDITOR_CLASS_REFERENCE); String editorCode = editorObject.getStringValue("code"); @@ -150,8 +150,6 @@ protected String render() throws EditException sdoc, xcontext); } catch (Exception e) { throw new EditException("Failed to render the editor code.", e); - } finally { - xcontext.put(SECURITY_DOCUMENT, previousSecurityDocument); } }