Author: jleroux
Date: Mon Dec 16 22:10:54 2013
New Revision: 1551375
URL:
http://svn.apache.org/r1551375Log:
Somehow this was lost (was in Jinghai's OFBiz-5312-product-ecommerce-seo-20131031.patch)
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/category/ftl/OfbizCatalogAltUrlTransform.java
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/category/ftl/OfbizCatalogAltUrlTransform.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/category/ftl/OfbizCatalogAltUrlTransform.java?rev=1551375&r1=1551374&r2=1551375&view=diff==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/category/ftl/OfbizCatalogAltUrlTransform.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/category/ftl/OfbizCatalogAltUrlTransform.java Mon Dec 16 22:10:54 2013
@@ -25,6 +25,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
+import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.template.FreeMarkerWorker;
@@ -35,7 +36,8 @@ import org.ofbiz.product.category.Catalo
import org.ofbiz.product.category.CategoryContentWrapper;
import org.ofbiz.product.product.ProductContentWrapper;
import org.ofbiz.service.LocalDispatcher;
-import org.ofbiz.webapp.control.RequestHandler;
+import org.ofbiz.webapp.OfbizUrlBuilder;
+import org.ofbiz.webapp.control.WebAppConfigurationException;
import freemarker.core.Environment;
import freemarker.ext.beans.BeanModel;
@@ -120,8 +122,12 @@ public class OfbizCatalogAltUrlTransform
}
// make the link
if (fullPath){
- String serverRootUrl = RequestHandler.getDefaultServerRootUrl(request, secure);
- newURL.append(serverRootUrl);
+ try {
+ OfbizUrlBuilder builder = OfbizUrlBuilder.from(request);
+ builder.buildHostPart(newURL, "", secure);
+ } catch (WebAppConfigurationException e) {
+ Debug.logError(e.getMessage(), module);
+ }
}
newURL.append(url);
out.write(newURL.toString());