diff options
| author | Leif Åstrand <leif@vaadin.com> | 2014-11-14 15:27:49 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-12-02 18:53:11 +0000 |
| commit | 3c59a1f08d6e2288c4bcd0ac74273ae14c4d4e0b (patch) | |
| tree | 3daaf9abae0297a76f20e11aa12574f691dff714 /server/src/com/vaadin/ui/UI.java | |
| parent | 654846837379db9a76823f5d0e73e5e6bfa8115d (diff) | |
| download | vaadin-framework-3c59a1f08d6e2288c4bcd0ac74273ae14c4d4e0b.tar.gz vaadin-framework-3c59a1f08d6e2288c4bcd0ac74273ae14c4d4e0b.zip | |
Escape dynamic and configured theme names in the same way. (#15309)
Change-Id: Ib7fd42e6017d0b78e6d5e6bd7f531f0cd6c8c0ab
Diffstat (limited to 'server/src/com/vaadin/ui/UI.java')
| -rw-r--r-- | server/src/com/vaadin/ui/UI.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java index 78cb5488e8..44948dfb6f 100644 --- a/server/src/com/vaadin/ui/UI.java +++ b/server/src/com/vaadin/ui/UI.java @@ -633,7 +633,11 @@ public abstract class UI extends AbstractSingleComponentContainer implements this.embedId = embedId; // Actual theme - used for finding CustomLayout templates - getState().theme = request.getParameter("theme"); + String unescapedThemeName = request.getParameter("theme"); + if (unescapedThemeName != null) { + // Set theme escapes the name + setTheme(unescapedThemeName); + } getPage().init(request); @@ -1164,7 +1168,7 @@ public abstract class UI extends AbstractSingleComponentContainer implements * The new theme name */ public void setTheme(String theme) { - getState().theme = theme; + getState().theme = VaadinServlet.stripSpecialChars(theme); } /** |