Skip to content

Conversation

@michitux
Copy link
Contributor

Jira URL

https://jira.xwiki.org/browse/XWIKI-23634

Changes

Description

  • 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.

Clarifications

  • It seems a bit dangerous to assume that every skin extension has its own line, but I don't know any better solution. We could also change the order of the skin extensions but that seems even more dangerous.

Screenshots & Video

No UI changes.

Executed Tests

Manual tests only so far, automated tests are still missing.

Expected merging strategy

  • Prefers squash: Yes
  • Backport on branches:
    • stable-17.10.x - feels like an important fix, but also not important enough for old LTS versions

* 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.
@michitux michitux self-assigned this Dec 19, 2025
</div> ## commentscontent
#end ## comment == ''
#getRequiredSkinExtensions($requiredSkinExtensions)
#set ($discard = $response.setHeader('X-XWIKI-HTML-HEAD', $requiredSkinExtensions))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we declare a macro for that? Would avoid repeating the header name everywhere if we ever want to change it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants