Author: nmalin
Date: Fri Jun 12 21:28:11 2015
New Revision: 1685176
URL:
http://svn.apache.org/r1685176Log:
correct renderLink macro on foScreenMacroLibrary.ftl to avoid a freemarker stacktrace, related to OFBIZ-6461
Modified:
ofbiz/trunk/framework/widget/templates/foScreenMacroLibrary.ftl
Modified: ofbiz/trunk/framework/widget/templates/foScreenMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/foScreenMacroLibrary.ftl?rev=1685176&r1=1685175&r2=1685176&view=diff==============================================================================
--- ofbiz/trunk/framework/widget/templates/foScreenMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/foScreenMacroLibrary.ftl Fri Jun 12 21:28:11 2015
@@ -62,7 +62,7 @@ under the License.
<#macro renderHorizontalSeparator id style><fo:block><fo:leader leader-length="100%" leader-pattern="rule" rule-style="solid" rule-thickness="0.1mm" color="black"/></fo:block></#macro>
<#macro renderLabel text id style><#if text?has_content><fo:block <#if style?has_content><@getFoStyle style/></#if> <#if id?has_content> id="${id}"</#if>>${text}</fo:block></#if></#macro>
-<#macro renderLink parameterList targetWindow target uniqueItemName linkType actionUrl id style name linkUrl text imgStr></#macro>
+<#macro renderLink parameterList targetWindow target uniqueItemName linkType actionUrl id style name height width linkUrl text imgStr></#macro>
<#macro renderImage src id style wid hgt border alt urlString><fo:block><fo:external-graphic id="${id}" src="${src}" content-width="${wid}" content-height="${hgt}" scaling="non-uniform"/></fo:block></#macro>
<#macro renderContentFrame></#macro>