Branch: refs/heads/stable-17.10.x Home: https://github.com/xwiki/xwiki-platform Commit: c5c9b0d4f07f76220e0b7562d1c8079fb6950f52 https://github.com/xwiki/xwiki-platform/commit/c5c9b0d4f07f76220e0b7562d1c80... Author: Michael Hamann <[email protected]> Date: 2026-01-13 (Tue, 13 Jan 2026) Changed paths: M xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-ui/src/main/resources/AnnotationCode/CreateForm.xml M xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-ui/src/main/resources/AnnotationCode/EditForm.xml M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageEditorService.xml M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageSelectorService.xml M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/MacroService.xml M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/OfficeImporter.xml M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/VelocityMacros.xml M xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-default/src/main/java/org/xwiki/export/pdf/internal/DefaultRequiredSkinExtensionsRecorder.java M xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-default/src/test/java/org/xwiki/export/pdf/internal/DefaultRequiredSkinExtensionsRecorderTest.java M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/attachmentsinline.vm M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/commentfield.vm M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/commentsinline.vm M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/docextra.vm M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/loaddocextrauix.vm M xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-default/src/main/resources/templates/security/requiredrights/requiredRightsEditConfirmationChecker.vm M xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-default/src/main/resources/templates/security/requiredrights/requiredRightsEditConfirmationCheckerError.vm M xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-ui/src/main/resources/templates/security/requiredrights/getMissingRequiredRightsWarning.vm M xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-ui/src/main/resources/templates/security/requiredrights/getRequiredRightsInformation.vm M xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-test/src/test/it/org/xwiki/uiextension/test/ui/UIExtensionTest.java M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/changesinline.vm M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/createinline.vm M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/display.vm M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/display_macros.vm M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/informationinline.vm M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/test/java/org/xwiki/web/DisplayPageTest.java Log Message: ----------- XWIKI-23634: JSX resources loaded twice when loading docextra tab UIX (#4973) * Use the required skin extensions mechanism from display_macros.vm for loaddocextrauix.vm and commentsinline.vm. * Remove the duplicate loading of skin extensions as it isn't required anymore. * Fix display_macros.vm to actually filter out duplicates as it didn't actually work when on this page skin extensions were combined with on-demand ones. * Add a macro to directly set the X-XWIKI-HTML-HEAD header. * Use the new macro everywhere where the header was previously set directly. * Use the macros from display_macros.vm in the CKEditor code instead of the copied macros there, deprecate the copied macros. * Update DefaultRequiredSkinExtensionsRecorder to use the same line splitting to properly work with "on this page" resources. * Add a page test to check for the X-XWIKI-HTML-HEAD header. * Add a UI test that verifies that DocExtra UI extensions work and that they can load on demand skin extensions but don't load on this page skin extensions again. (cherry picked from commit e974f1ac49940bf534cd0c890c9d8b792c443934) To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications