Author: michiel
Date: 2010-04-06 11:37:46 +0200 (Tue, 06 Apr 2010)
New Revision: 41765
Modified:
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/button.tagx
Log:
avoid confusing if parameters happens to be on session or so
Modified:
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/button.tagx
===================================================================
---
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/button.tagx
2010-04-06 08:37:00 UTC (rev 41764)
+++
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/button.tagx
2010-04-06 09:37:46 UTC (rev 41765)
@@ -1,6 +1,7 @@
<jsp:root
xmlns:jsp="http://java.sun.com/JSP/Page";
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+ xmlns:fn="http://java.sun.com/jsp/jstl/functions";
xmlns:c="http://java.sun.com/jsp/jstl/core";
version="2.0"
>
@@ -20,18 +21,20 @@
<jsp:directive.attribute name="alt" type="java.lang.String" />
- <c:if test="${empty parameters}">
+
+ <c:if test="${empty jspContext.parameters.icondir}">
<c:set var="parameters"
value="${requestScope['org.mmbase.sr.relatednodes.parameters']}" />
</c:if>
<mm:haspage page="${parameters.icondir}/${type}.jspx">
<c:set var="alt">
- <mm:include page="${parameters.icondir}/${type}.jspx">
+ <mm:include page="${parameters.icondir}/${type}.jspx">
<mm:param name="rid">${parameters.rid}</mm:param>
</mm:include>
</c:set>
</mm:haspage>
<mm:haspage page="${parameters.icondir}/${type}.png">
+
<mm:link page="${parameters.icondir}/${type}.png">
<img class="icon"
alt="${empty alt ? '+' : mm:escape('tagstripper(NONE),trimmer',
alt)}"
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
