Author: aheritier
Date: Sat Sep 3 16:42:42 2005
New Revision: 267518
URL: http://svn.apache.org/viewcvs?rev=267518&view=rev
Log:
MPXDOC-162 : Special characters in menu ids aren't escaped.
Patch submitted by : Lukas Theussl
Patch reviewed by : Arnaud Heritier
Modified:
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl
maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl?rev=267518&r1=267517&r2=267518&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl Sat Sep 3
16:42:42 2005
@@ -619,7 +619,6 @@
<!-- Process a menu for the navigation bar -->
<jsl:template match="menu" trim="true">
<j:set var="_menuName"><x:expr select="string(@name)"/></j:set>
- <j:set var="_menuNameEscaped"><doc:escapeNameToken
value="${_menuName}"/></j:set>
<!-- Key is more important than message... -->
<j:set var="_key">
<x:expr select="@key" />
@@ -638,6 +637,7 @@
</fmt:bundle>
</j:if>
</j:if>
+ <j:set var="_menuNameEscaped"><doc:escapeNameToken
value="${_menuName}"/></j:set>
<j:choose>
<j:when test="${!empty(_menuName)}">
Modified: maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml?rev=267518&r1=267517&r2=267518&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml Sat Sep 3 16:42:42 2005
@@ -26,6 +26,7 @@
</properties>
<body>
<release version="1.9.2-SNAPSHOT" date="In SVN">
+ <action dev="aheritier" type="fix" issue="MPXDOC-162" due-to="Lukas
Theussl">Special characters in menu ids aren't escaped.</action>
<action dev="aheritier" type="fix" issue="MPXDOC-156" due-to="Jeff
Jensen">Add documentation about "external links" and "new windows".</action>
<action dev="aheritier" type="fix" issue="MPXDOC-155" due-to="Lukas
Theussl">Xdoc plugin >= 1.9 not compatible with older customised
site.jsl.</action>
<action dev="aheritier" type="fix" issue="MPXDOC-154" due-to="Juan F.
Codagnone,Vincent Siveton,Lukas Theussl">System locale setting makes test cases
fail.</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
