Changeset 26106

Show
Ignore:
Timestamp:
15.08.2012 15:53:30 (7 years ago)
Author:
ak19
Message:

Fixed an oversight to recent changes made to XSLTUtil.java's tidyWhitespace and stripWhitespace methods: they now takes two parameters, so xsl files calling these methods (though nothing calls stripWhitespace) need to pass the 2nd, language, parameter too now.

Location:
main/trunk/greenstone3/web/interfaces
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/web/interfaces/default/transform/layouts/header.xsl

    r26094 r26106  
    401401                        <nobr> 
    402402                            <xsl:apply-templates select="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery']/paramList/param[@name='query']"> 
    403                                 <xsl:with-param name="default" select="java:org.greenstone.gsdl3.util.XSLTUtil.tidyWhitespace($qs)"/> 
     403                                <xsl:with-param name="default" select="java:org.greenstone.gsdl3.util.XSLTUtil.tidyWhitespace($qs,/page/@lang)"/> 
    404404                            </xsl:apply-templates> 
    405405                        </nobr> 
  • main/trunk/greenstone3/web/interfaces/gs2/transform/query-common.xsl

    r24025 r26106  
    144144      <xsl:otherwise> 
    145145        <xsl:variable name="qs"><xsl:apply-templates select="param[@name='query']" mode="calculate-default"/></xsl:variable> 
    146         <nobr><xsl:apply-templates select="param[@name='query']"><xsl:with-param name="default" select="java:org.greenstone.gsdl3.util.XSLTUtil.tidyWhitespace($qs)"/></xsl:apply-templates><input type="submit"><xsl:attribute name="value"><xsl:value-of select="../displayItem[@name='submit']"/></xsl:attribute></input></nobr> 
     146        <nobr><xsl:apply-templates select="param[@name='query']"><xsl:with-param name="default" select="java:org.greenstone.gsdl3.util.XSLTUtil.tidyWhitespace($qs,/page/@lang)"/></xsl:apply-templates><input type="submit"><xsl:attribute name="value"><xsl:value-of select="../displayItem[@name='submit']"/></xsl:attribute></input></nobr> 
    147147      </xsl:otherwise> 
    148148    </xsl:choose>