[gatein-commits] gatein SVN: r4890 - portal/branches/branch-GTNPORTAL-1592/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component.

[do-not-reply at jboss.org]

Author: ndkhoiits
Date: 2010-11-01 11:46:08 -0400 (Mon, 01 Nov 2010)
New Revision: 4890

Modified:
   portal/branches/branch-GTNPORTAL-1592/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarSitePortlet.java
Log:
GTNPORTAL 1614 Have problems with portal name containing "portal" keyword

Modified: portal/branches/branch-GTNPORTAL-1592/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarSitePortlet.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1592/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarSitePortlet.java	2010-11-01 13:32:30 UTC (rev 4889)
+++ portal/branches/branch-GTNPORTAL-1592/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarSitePortlet.java	2010-11-01 15:46:08 UTC (rev 4890)
@@ -60,7 +60,8 @@
 
    public String getPortalURI(String portalName)
    {
-      return Util.getPortalRequestContext().getPortalURI().replace(getCurrentPortal(), portalName);
+      String currentPortalURI = Util.getPortalRequestContext().getPortalURI();
+      return currentPortalURI.substring(0, currentPortalURI.lastIndexOf(getCurrentPortal())) + portalName + "/";
    }
 
    public PageNavigation getCurrentPortalNavigation() throws Exception