diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java index d541dbd8f..021e82cd8 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java @@ -491,16 +491,14 @@ public class Authenticate extends FreemarkerHttpServlet { /** What's the URL for the login screen? */ private String getLoginScreenUrl(HttpServletRequest request) { String contextPath = request.getContextPath(); - String urlParams = "?home=" + getPortalIdString(request) - + "&login=block"; + String urlParams = "?login=block"; return contextPath + Controllers.LOGIN + urlParams; } /** What's the URL for the site admin screen? */ private String getSiteAdminUrl(HttpServletRequest request) { String contextPath = request.getContextPath(); - String urlParams = "?home=" + getPortalIdString(request) - + "&login=block"; + String urlParams = "?login=block"; return contextPath + Controllers.SITE_ADMIN + urlParams; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java index 5bf61902e..dbabb636e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java @@ -183,16 +183,14 @@ public class LoginTemplateHelper extends LoginTemplateHelperBase { /** What's the URL for this servlet? */ private String getAuthenticateUrl(HttpServletRequest request) { String contextPath = request.getContextPath(); - String urlParams = "?home=" + getPortalIdString(request) - + "&login=block"; + String urlParams = "?login=block"; return contextPath + "/authenticate" + urlParams; } /** What's the URL for this servlet, with the cancel parameter added? */ private String getCancelUrl(HttpServletRequest request) { String contextPath = request.getContextPath(); - String urlParams = "?home=" + getPortalIdString(request) - + "&login=block&cancel=true"; + String urlParams = "?login=block&cancel=true"; return contextPath + "/authenticate" + urlParams; }