Branch: refs/heads/stable-18.6.x Home: https://github.com/xwiki/xwiki-rendering Commit: c92d1fd38a8488f6d89e0c6f4c1cc476044e729c https://github.com/xwiki/xwiki-rendering/commit/c92d1fd38a8488f6d89e0c6f4c1c... Author: Marius Dumitru Florea <[email protected]> Date: 2026-07-22 (Wed, 22 Jul 2026) Changed paths: M xwiki-rendering-api/src/main/java/org/xwiki/rendering/block/XDOM.java M xwiki-rendering-api/src/main/java/org/xwiki/rendering/util/IdGenerator.java A xwiki-rendering-api/src/test/java/org/xwiki/rendering/block/XDOMTest.java M xwiki-rendering-api/src/test/java/org/xwiki/rendering/util/IdGeneratorTest.java M xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/internal/macro/DefaultMacroContentParser.java M xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/test/java/org/xwiki/rendering/internal/macro/DefaultMacroContentParserTest.java Log Message: ----------- XRENDERING-802: Prepared macro content leads to duplicated IDs when inserted * Add IdGenerator#adaptId(String) to adapt an existing id (make it unique in the scope of this id generator) * Add XDOM#setIdGenerator(IdGenerator, boolean) to allow adapting the existing ids when changing the id generator of an XDOM * Adapt the existing ids from the prepared macro content XDOM clone before inserting it into the target document * Add unit tests (cherry picked from commit 0bf644feb4f6526f5e7f101f918bf4925389f922) Commit: 811eb7ce19c6a8a15c35f0519de8af14ba024441 https://github.com/xwiki/xwiki-rendering/commit/811eb7ce19c6a8a15c35f0519de8... Author: Marius Dumitru Florea <[email protected]> Date: 2026-07-22 (Wed, 22 Jul 2026) Changed paths: M xwiki-rendering-api/src/test/java/org/xwiki/rendering/util/IdGeneratorTest.java M xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/internal/macro/DefaultMacroContentParser.java M xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/test/java/org/xwiki/rendering/internal/macro/DefaultMacroContentParserTest.java Log Message: ----------- XRENDERING-802: Prepared macro content leads to duplicated IDs when inserted * Apply Michael's suggestion to use a fresh ID generator when preparing the macro content. (cherry picked from commit 0316f87b1416182e98973102d9e24f2f695a8a4d) Compare: https://github.com/xwiki/xwiki-rendering/compare/a205b03ae839...811eb7ce19c6 To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-rendering/settings/notifications