Updated Branches: refs/heads/wicket-1.5.x 8be6d6717 -> d8de9020a
HTML unescape values in #putAll Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d8de9020 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d8de9020 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d8de9020 Branch: refs/heads/wicket-1.5.x Commit: d8de9020a0134fea51bec3059cecd3da04455a97 Parents: c31e100 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Apr 20 16:54:30 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Apr 20 16:56:04 2012 +0300 ---------------------------------------------------------------------- .../apache/wicket/markup/parser/TagAttributes.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/d8de9020/wicket-core/src/main/java/org/apache/wicket/markup/parser/TagAttributes.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/TagAttributes.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/TagAttributes.java index c824c03..6f9719d 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/TagAttributes.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/TagAttributes.java @@ -60,12 +60,12 @@ public class TagAttributes extends ValueMap @Override public final void putAll(Map<? extends String, ?> map) { - for (Object o : map.keySet()) + for (Map.Entry<? extends String, ?> entry : map.entrySet()) { - String key = (String)o; + String key = entry.getKey(); + Object value = entry.getValue(); + put(key, value); } - - super.putAll(map); } /**
