Author: jleroux Date: Tue Mar 29 20:44:30 2016 New Revision: 1737046 URL: http://svn.apache.org/viewvc?rev=1737046&view=rev Log: A patch from James Yong for <<Unable to change language in ecommerce>> https://issues.apache.org/jira/browse/OFBIZ-6966
Problem ======= Go to http://localhost:8080/ecommerce/ Change the language dropdown from English to another language will revert back to English. I am using SVN revision 1735923 jleroux: This was due to OFBIZ-6879 ("Remove forceHttpSession feature"). Now as soon as you start with HTTPS instead of HTTP it works. I mean other links don't get back on HTTP, see OFBIZ-6966 for details... More to come with OFBIZ-6849, hopefully soon... Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/category/ftl/UrlRegexpTransform.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/category/ftl/UrlRegexpTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/category/ftl/UrlRegexpTransform.java?rev=1737046&r1=1737045&r2=1737046&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/category/ftl/UrlRegexpTransform.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/category/ftl/UrlRegexpTransform.java Tue Mar 29 20:44:30 2016 @@ -100,7 +100,7 @@ public class UrlRegexpTransform implemen } RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_"); - out.write(seoUrl(rh.makeLink(request, response, buf.toString(), fullPath, secure, encode), userLogin == null)); + out.write(seoUrl(rh.makeLink(request, response, buf.toString(), fullPath, secure || request.isSecure() , encode), userLogin == null)); } else if (prefix != null) { if (prefix instanceof TemplateScalarModel) { TemplateScalarModel s = (TemplateScalarModel) prefix; Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?rev=1737046&r1=1737045&r2=1737046&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Tue Mar 29 20:44:30 2016 @@ -1143,7 +1143,7 @@ public class RequestHandler { } public String makeLink(HttpServletRequest request, HttpServletResponse response, String url) { - return makeLink(request, response, url, false, false, true); + return makeLink(request, response, url, false, request.isSecure(), true); } public String makeLink(HttpServletRequest request, HttpServletResponse response, String url, boolean fullPath, boolean secure, boolean encode) {
