Branch: refs/heads/stable-16.9.x Home: https://github.com/xwiki/xwiki-platform Commit: df9aac500c145b581052cdf3a9d8aa32e019bf63 https://github.com/xwiki/xwiki-platform/commit/df9aac500c145b581052cdf3a9d8a... Author: Michael Hamann <michael.hamann@xwiki.com> Date: 2024-10-25 (Fri, 25 Oct 2024) Changed paths: M xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-macro/src/main/java/org/xwiki/rendering/internal/macro/display/DisplayMacro.java M xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-include/src/main/java/org/xwiki/rendering/internal/macro/include/AbstractIncludeMacro.java M xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-include/src/main/java/org/xwiki/rendering/internal/macro/include/IncludeMacro.java Log Message: ----------- XWIKI-21125: Include and Display macros should generate inline content when used in an inline context * Really only convert a single paragraph to avoid regressions when including macros that don't support inline mode. (cherry picked from commit f284fdc3178ae859acdd312dd2b847ed611924db) To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications