diff options
| -rw-r--r-- | src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java index 9b7595d18e..529d1f4229 100644 --- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java +++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java @@ -526,11 +526,11 @@ public class ApplicationServlet extends HttpServlet { // Using custom theme themeUri = staticFilePath + "/" + THEME_DIRECTORY_PATH + themeName; } - page.write("', pathInfo: '" + pathInfo + "', themeUri: '" + themeUri - + "'\n};\n" + "</script>\n" - + "<script language='javascript' src='" + staticFilePath + "/" - + WIDGETSET_DIRECTORY_PATH + widgetset + "/" + widgetset - + ".nocache.js'></script>\n"); + page.write("', pathInfo: '" + pathInfo + "', themeUri: " + + (themeUri != null ? "'" + themeUri + "'" : "null") + "\n};\n" + + "</script>\n" + "<script language='javascript' src='" + + staticFilePath + "/" + WIDGETSET_DIRECTORY_PATH + widgetset + + "/" + widgetset + ".nocache.js'></script>\n"); if (themeName != null) { // Custom theme's stylesheet |