Branch: refs/heads/stable-15.10.x Home: https://github.com/xwiki/xwiki-rendering Commit: cc427c1a0635228a0d10a0444ed7b7a5b1bdd687 https://github.com/xwiki/xwiki-rendering/commit/cc427c1a0635228a0d10a0444ed7... Author: Michael Hamann <michael.hamann@xwiki.com> Date: 2024-04-26 (Fri, 26 Apr 2024) Changed paths: M xwiki-rendering-syntaxes/xwiki-rendering-syntax-xhtml/src/main/java/org/xwiki/rendering/internal/parser/xhtml/wikimodel/XHTMLXWikiGeneratorListener.java A xwiki-rendering-syntaxes/xwiki-rendering-syntax-xhtml/src/test/resources/xhtml10/specific/macro/macro11.test Log Message: ----------- XRENDERING-746: When there are two spans with metadata nested in each other, the metadata attributes aren't cleaned * Consider any element that has the class as metadata, don't require that it is the only class. * Remove just the metadata class from the classes during cleanup. (cherry picked from commit 054894d2f748cba50dd51592f124468df4fe9572) Commit: 7db839de49de6ad6bcf4631cb501994e450e129d https://github.com/xwiki/xwiki-rendering/commit/7db839de49de6ad6bcf4631cb501... Author: Michael Hamann <michael.hamann@xwiki.com> Date: 2024-04-26 (Fri, 26 Apr 2024) Changed paths: M xwiki-rendering-syntaxes/xwiki-rendering-syntax-xhtml/src/test/resources/xhtml10/specific/macro/macro10.test M xwiki-rendering-syntaxes/xwiki-rendering-syntax-xhtml/src/test/resources/xhtml10/specific/macro/macro9.test Log Message: ----------- XRENDERING-745: Impossible to save page with specific source code in CKEditor or WYSIWYG editor * Improve the description of the test cases. (cherry picked from commit 91939b0eb487911ac4b8c3f021221b91b2124a96) Commit: 0e82911d35ae90b64ade2732f2944c5e173dc617 https://github.com/xwiki/xwiki-rendering/commit/0e82911d35ae90b64ade2732f294... Author: Michael Hamann <michael.hamann@xwiki.com> Date: 2024-04-26 (Fri, 26 Apr 2024) Changed paths: M xwiki-rendering-syntaxes/xwiki-rendering-syntax-xhtml/src/main/java/org/xwiki/rendering/internal/parser/xhtml/wikimodel/XHTMLXWikiGeneratorListener.java Log Message: ----------- XRENDERING-746: When there are two spans with metadata nested in each other, the metadata attributes aren't cleaned * Simplify the code using ArrayUtils.contains() (cherry picked from commit 60eb7ec7a69054993421c480fb8628251ac5aee6) Compare: https://github.com/xwiki/xwiki-rendering/compare/a90235eb83ed...0e82911d35ae To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-rendering/settings/notifications