Updated Branches:
  refs/heads/wicket-1.4.x 65d5554cb -> 2faab9517

Escape pageMap's name from characters which may break the produced HTML.


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2faab951
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2faab951
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2faab951

Branch: refs/heads/wicket-1.4.x
Commit: 2faab951738702b0251ed41e5b137bd5a9fc127d
Parents: be669ae
Author: Martin Tzvetanov Grigorov <[email protected]>
Authored: Wed Jan 18 15:07:51 2012 +0100
Committer: Martin Tzvetanov Grigorov <[email protected]>
Committed: Wed Jan 18 15:07:51 2012 +0100

----------------------------------------------------------------------
 wicket/src/main/java/org/apache/wicket/Page.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/2faab951/wicket/src/main/java/org/apache/wicket/Page.java
----------------------------------------------------------------------
diff --git a/wicket/src/main/java/org/apache/wicket/Page.java 
b/wicket/src/main/java/org/apache/wicket/Page.java
index b7bcd6b..c19871c 100644
--- a/wicket/src/main/java/org/apache/wicket/Page.java
+++ b/wicket/src/main/java/org/apache/wicket/Page.java
@@ -44,6 +44,7 @@ import org.apache.wicket.settings.IDebugSettings;
 import org.apache.wicket.util.lang.Classes;
 import org.apache.wicket.util.lang.Objects;
 import org.apache.wicket.util.string.StringValue;
+import org.apache.wicket.util.string.Strings;
 import org.apache.wicket.version.IPageVersionManager;
 import org.apache.wicket.version.undo.Change;
 import org.slf4j.Logger;
@@ -1248,6 +1249,10 @@ public abstract class Page extends MarkupContainer 
implements IRedirectListener,
                {
                        RequestParameters parameters = 
getRequest().getRequestParameters();
                        pageMapName = parameters.getPageMapName();
+                       if (pageMapName != null)
+                       {
+                               pageMapName = 
Strings.escapeMarkup(pageMapName).toString();
+                       }
                }
 
                final IPageMap pageMap = PageMap.forName(pageMapName);

Reply via email to