svn commit: r1067407 - in /forrest/trunk/main/webapp/skins: coat/xslt/html/site-to-xhtml.xsl pelt/xslt/html/site-to-xhtml.xsl scales/xslt/html/site-to-xhtml.xsl

Author: crossley
Date: Sat Feb  5 08:07:14 2011
New Revision: 1067407

URL: http://svn.apache.org/viewvc?rev=1067407&view=rev
Log:
Handle a strange error that happens in WAR mode only.
Use the variable before trying to process it.
Issue: FOR-1220

Modified:
    forrest/trunk/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl
    forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl
    forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl

Modified: forrest/trunk/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl?rev=1067407&r1=1067406&r2=1067407&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl Sat Feb  5 08:07:14 2011
 <at>  <at>  -57,7 +57,7  <at>  <at>  footer, searchbar, css etc.  As input, i
   |title
   +-->
         <title><xsl:value-of select="div[ <at> id='content']/h1"/>
-          <xsl:if test="$config/motd">
+          <xsl:if test="count($config/motd/motd-option) &gt; 0">
             <xsl:for-each select="$config/motd/motd-option">
               <xsl:choose>
                 <xsl:when test=" <at> starts-with='true'">
 <at>  <at>  -468,7 +468,7  <at>  <at>  footer, searchbar, css etc.  As input, i
           </xsl:for-each>
         </xsl:if>
 <!-- Message of the day -->
-        <xsl:if test="$config/motd">
+        <xsl:if test="count($config/motd/motd-option) &gt; 0">
           <xsl:for-each select="$config/motd/motd-option">
             <xsl:choose>
               <xsl:when test=" <at> starts-with='true'">

Modified: forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl?rev=1067407&r1=1067406&r2=1067407&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl Sat Feb  5 08:07:14 2011
 <at>  <at>  -57,7 +57,7  <at>  <at>  footer, searchbar, css etc.  As input, i
   |title
   +-->
         <title><xsl:value-of select="div[ <at> id='content']/h1"/>
-          <xsl:if test="$config/motd">
+          <xsl:if test="count($config/motd/motd-option) &gt; 0">
             <xsl:for-each select="$config/motd/motd-option">
               <xsl:choose>
                 <xsl:when test=" <at> starts-with='true'">
 <at>  <at>  -520,7 +520,7  <at>  <at>  document.write("]]><i18n:text >Last Publ
           </xsl:for-each>
         </xsl:if>
 <!-- Message of the day -->
-        <xsl:if test="$config/motd">
+        <xsl:if test="count($config/motd/motd-option) &gt; 0">
           <xsl:for-each select="$config/motd/motd-option">
             <xsl:choose>
               <xsl:when test=" <at> starts-with='true'">

Modified: forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl?rev=1067407&r1=1067406&r2=1067407&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl Sat Feb  5 08:07:14 2011
 <at>  <at>  -57,7 +57,7  <at>  <at>  footer, searchbar, css etc.  As input, i
   |title
   +-->
         <title><xsl:value-of select="div[ <at> id='content']/h1"/>
-          <xsl:if test="$config/motd">
+          <xsl:if test="count($config/motd/motd-option) &gt; 0">
             <xsl:for-each select="$config/motd/motd-option">
               <xsl:choose>
                 <xsl:when test=" <at> starts-with='true'">
 <at>  <at>  -516,7 +516,7  <at>  <at>  document.write("]]><i18n:text >Last Publ
           </xsl:for-each>
         </xsl:if>
 <!-- Message of the day -->
-        <xsl:if test="$config/motd">
+        <xsl:if test="count($config/motd/motd-option) &gt; 0">
           <xsl:for-each select="$config/motd/motd-option">
             <xsl:choose>
               <xsl:when test=" <at> starts-with='true'">