Skip to content
Snippets Groups Projects
Commit a3a91719 authored by srosse's avatar srosse
Browse files

OO-4219: fix double escaping

parent 29369a62
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java
+ 3
− 3
View file @ a3a91719
...@@ -496,7 +496,7 @@ public class BaseFullWebappController extends BasicController implements DTabs, ...@@ -496,7 +496,7 @@ public class BaseFullWebappController extends BasicController implements DTabs,
String linkName = "t" + CodeHelper.getRAMUniqueID(); String linkName = "t" + CodeHelper.getRAMUniqueID();
siteLinks.add(linkName); siteLinks.add(linkName);
Link link = LinkFactory.createCustomLink(linkName, "t", "", Link.NONTRANSLATED, navSitesVc, this); Link link = LinkFactory.createCustomLink(linkName, "t", "", Link.NONTRANSLATED, navSitesVc, this);
link.setCustomDisplayText(StringHelper.escapeHtml(StringHelper.xssScan(navEl.getTitle()))); link.setCustomDisplayText(StringHelper.xssScan(navEl.getTitle()));
link.setTitle(navEl.getDescription()); link.setTitle(navEl.getDescription());
link.setUserObject(si); link.setUserObject(si);
Character accessKey = navEl.getAccessKey(); Character accessKey = navEl.getAccessKey();
...@@ -1239,7 +1239,7 @@ public class BaseFullWebappController extends BasicController implements DTabs, ...@@ -1239,7 +1239,7 @@ public class BaseFullWebappController extends BasicController implements DTabs,
dtabsLinkNames.add(dtabCreateCounter); dtabsLinkNames.add(dtabCreateCounter);
String linkId = "a" + dtabCreateCounter; String linkId = "a" + dtabCreateCounter;
Link link = LinkFactory.createCustomLink(linkId, linkId, "", Link.NONTRANSLATED, navTabsVc, this); Link link = LinkFactory.createCustomLink(linkId, linkId, "", Link.NONTRANSLATED, navTabsVc, this);
link.setCustomDisplayText(StringHelper.escapeHtml(StringHelper.xssScan(dt.getNavElement().getTitle()))); link.setCustomDisplayText(StringHelper.xssScan(dt.getNavElement().getTitle()));
link.setIconLeftCSS("o_icon o_icon-fw ".concat(dt.getNavElement().getIconCSSClass())); link.setIconLeftCSS("o_icon o_icon-fw ".concat(dt.getNavElement().getIconCSSClass()));
link.setTitle(dt.getTitle()); link.setTitle(dt.getTitle());
link.setUserObject(dt); link.setUserObject(dt);
...@@ -1274,7 +1274,7 @@ public class BaseFullWebappController extends BasicController implements DTabs, ...@@ -1274,7 +1274,7 @@ public class BaseFullWebappController extends BasicController implements DTabs,
Link link = (Link)navTabsVc.getComponent("a" + i); Link link = (Link)navTabsVc.getComponent("a" + i);
if (link != null && dTab.equals(link.getUserObject())) { if (link != null && dTab.equals(link.getUserObject())) {
// correct link found - updte titel and we are done // correct link found - updte titel and we are done
link.setCustomDisplayText(StringHelper.escapeHtml(StringHelper.xssScan(newTitle))); link.setCustomDisplayText(StringHelper.xssScan(newTitle));
return; return;
} }
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment