From 97d05ea825b3e824ce7923b5326727b7ae9d0a89 Mon Sep 17 00:00:00 2001
From: aheritier <aheritier@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 3 Sep 2005 23:42:42 +0000
Subject: [PATCH] MPXDOC-162 : Special characters in menu ids aren't escaped.
 Patch submitted by : Lukas Theussl Patch reviewed by : Arnaud Heritier

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@267518 13f79535-47bb-0310-9956-ffa450edef68
---
 xdoc/src/plugin-resources/site.jsl | 2 +-
 xdoc/xdocs/changes.xml             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/xdoc/src/plugin-resources/site.jsl b/xdoc/src/plugin-resources/site.jsl
index 5ba492b1..8982e850 100644
--- a/xdoc/src/plugin-resources/site.jsl
+++ b/xdoc/src/plugin-resources/site.jsl
@@ -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)}">
diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml
index e1cd3d3f..1e6d0d4f 100644
--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/xdocs/changes.xml
@@ -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>