Author: sdumitriu
Date: 2008-02-02 00:56:53 +0100 (Sat, 02 Feb 2008)
New Revision: 7272

Modified:
   
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/XWikiServletURLFactory.java
Log:
XWIKI-2056: The URL Factory should use the contextPath instead of the 
contextName
Fixed.


Modified: 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/XWikiServletURLFactory.java
===================================================================
--- 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/XWikiServletURLFactory.java
    2008-02-01 22:47:55 UTC (rev 7271)
+++ 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/XWikiServletURLFactory.java
    2008-02-01 23:56:53 UTC (rev 7272)
@@ -73,10 +73,7 @@
             (context.getWiki() == null) ? "" : 
context.getWiki().Param("xwiki.servletpath", "");
         if (servletPath.equals("")) {
             try {
-                servletPath =
-                    ((XWikiServletContext) 
context.getEngineContext()).getServletContext()
-                        .getServletContextName()
-                        + "/";
+                servletPath = 
context.getRequest().getContextPath().substring(1) + "/";
             } catch (Exception e) {
                 servletPath = path.substring(0, path.indexOf('/', 1) + 1);
             }

_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications

Reply via email to