The Unified and Autonomous Development Platform
fix issue #114: Can not jump to related comment via notification link after login
Robin Shen4138bd7cb56a
diff --git a/server-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java b/server-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.javaindex 4c7fe326f5..c6cdd86da1 100644--- a/server-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java+++ b/server-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java@@ -289,15 +289,22 @@ public class ServletWebResponse extends WebResponseString script = String.format(""+ "<script type='application/javascript'>"- + " if (location.hash) {"- + " var href = location.href;"- + " sessionStorage.setItem(href.substr(0, href.indexOf('#')), location.hash);"+ + " function getKey(url) {"+ + " var key = url;"+ + " if (key.indexOf('#') != -1)"+ + " key = key.substr(0, key.indexOf('#'));"+ + " return key.substr(key.indexOf(':'), key.length);"+ " }"+ + " if (location.hash) "+ + " sessionStorage.setItem(getKey(location.href), location.hash);"+ " var redirect = '%s';"- + " var hash = sessionStorage.getItem(redirect);"- + " if (hash) "- + " redirect += hash;"- + " sessionStorage.removeItem(redirect);"+ + " var key = getKey(redirect);"+ + " if (redirect.indexOf('#') == -1) {"+ + " var hash = sessionStorage.getItem(key);"+ + " if (hash) "+ + " redirect += hash;"+ + " }"+ + " sessionStorage.removeItem(key);"+ " window.location.replace(redirect);"+ "</script>", url);httpServletResponse.getOutputStream().write(script.getBytes());