Repository: wicket Updated Branches: refs/heads/wicket-6.x c2691cb5d -> 347301f7e
WICKET-5558 Autolinking does not always work in inheritted markup (cherry picked from commit d7a75a0462d7fccdc437ddc84cbb49faa432e3b1) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/347301f7 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/347301f7 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/347301f7 Branch: refs/heads/wicket-6.x Commit: 347301f7eee9f977d5198184dcac028f211a62ee Parents: c2691cb Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Authored: Mon Apr 14 15:07:48 2014 +0300 Committer: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Committed: Mon Apr 14 15:08:07 2014 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/markup/MergedMarkup.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/347301f7/wicket-core/src/main/java/org/apache/wicket/markup/MergedMarkup.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/MergedMarkup.java b/wicket-core/src/main/java/org/apache/wicket/markup/MergedMarkup.java index e685827..edfe938 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/MergedMarkup.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/MergedMarkup.java @@ -331,7 +331,9 @@ public class MergedMarkup extends Markup if (element instanceof ComponentTag && resource != null) { ComponentTag tag = (ComponentTag)element; - tag.setMarkupClass(markupClass); + if (tag.getMarkupClass() == null){ + tag.setMarkupClass(markupClass); + } } }
