From e0b91354ac81aeddd32baa8c74b1bc889bac09f4 Mon Sep 17 00:00:00 2001
From: Matthai Kurian <matthai.kurian@frentix.com>
Date: Thu, 19 Jul 2012 12:26:58 +0200
Subject: [PATCH] OO-315: CP MenuTree unescape fixed
---
.../core/gui/components/tree/MenuTreeRenderer.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/core/gui/components/tree/MenuTreeRenderer.java b/src/main/java/org/olat/core/gui/components/tree/MenuTreeRenderer.java
index 5868da32867..19d8099b901 100644
--- a/src/main/java/org/olat/core/gui/components/tree/MenuTreeRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/tree/MenuTreeRenderer.java
@@ -150,7 +150,6 @@ public class MenuTreeRenderer implements ComponentRenderer {
// render link
String title = curRoot.getTitle();
- title = StringEscapeUtils.escapeHtml(title).toString();
if (markedNode != null && markedNode == curRoot) {
target.append("<span style=\"border:2px solid red;\">");
@@ -236,10 +235,16 @@ public class MenuTreeRenderer implements ComponentRenderer {
ubu.buildURI(target, new String[] { COMMAND_ID, NODE_IDENT }, new String[] { COMMAND_TREENODE_CLICKED, curRoot.getIdent() });
}
}
+
// Add menu item title as alt hoover text
- target.append("\" title=\"");
- target.append(curRoot.getAltText() == null ? title : StringEscapeUtils.escapeHtml(curRoot.getAltText()).toString());
+ String alt = curRoot.getAltText();
+ if (alt != null) {
+ target.append("\" title=\"");
+ target.append(StringEscapeUtils.escapeHtml(alt).toString());
+ }
+
target.append("\"");
+
if (iframePostEnabled) {
ubu.appendTarget(target);
}
--
GitLab