Update of
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv26901/cmsc/portlets/src/java/com/finalist/cmsc/portlets
Modified Files:
Tag: b1_4
XsltPortlet.java
Log Message:
CMSC-1193 - Tag cmsc:renderURL does not take account of the host location of
the page
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-1193
Index: XsltPortlet.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/XsltPortlet.java,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -b -r1.3.2.2 -r1.3.2.3
--- XsltPortlet.java 1 Apr 2008 14:26:39 -0000 1.3.2.2
+++ XsltPortlet.java 17 Dec 2008 13:33:35 -0000 1.3.2.3
@@ -131,12 +131,16 @@
NavigationItem item =
SiteManagement.convertToNavigationItem(page);
if (item != null) {
link = SiteManagement.getPath(item,
!ServerUtil.useServerName());
- }
- else {
+ } else {
link = page;
}
- renderUrl = new PortletURLImpl(link, window,
(HttpServletRequest) request,
- (HttpServletResponse) response, false);
+ String host = null;
+ if (ServerUtil.useServerName()) {
+ host = SiteManagement.getSite(item);
+ }
+
+ renderUrl = new PortletURLImpl(host, link, window,
(HttpServletRequest) request, (HttpServletResponse) response, false);
+
} else {
renderUrl = response.createRenderURL();
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
