You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/04/14 14:08:04 UTC
git commit: WICKET-5558 Autolinking does not always work in
inheritted markup
Repository: wicket
Updated Branches:
refs/heads/master 7a4b37b78 -> d7a75a046
WICKET-5558 Autolinking does not always work in inheritted markup
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d7a75a04
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d7a75a04
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d7a75a04
Branch: refs/heads/master
Commit: d7a75a0462d7fccdc437ddc84cbb49faa432e3b1
Parents: 7a4b37b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Apr 14 15:07:48 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Apr 14 15:07:48 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/d7a75a04/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);
+ }
}
}