Index: website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/tags/menuitem.tag
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/tags/menuitem.tag	(revision 33914)
+++ website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/tags/menuitem.tag	(revision )
@@ -11,10 +11,12 @@
     <b><c:out value="${symbol_dollar}{siteMenuItem.name}"/></b>
   </c:when>
   <c:otherwise>
-    <hst:link var="link" link="${symbol_dollar}{siteMenuItem.hstLink}"/>
-    <c:if test="${symbol_dollar}{empty link}">
-      <c:set var="link" value="${symbol_dollar}{siteMenuItem.externalLink}"/>
-    </c:if>
+    <c:set var="link">
+      <c:choose>
+        <c:when test="${symbol_dollar}{not empty siteMenuItem.externalLink}">${symbol_dollar}{siteMenuItem.externalLink}</c:when>
+        <c:otherwise><hst:link link="${symbol_dollar}{siteMenuItem.hstLink}"/></c:otherwise>
+      </c:choose>
+    </c:set>
     <a href="${symbol_dollar}{link}"><c:out value="${symbol_dollar}{siteMenuItem.name}"/></a>
   </c:otherwise>
 </c:choose>