fixes #1767

svn changeset:4751/svn branch:trunk

2 files changed, 15 insertions, 1 deletions

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/Util.java b/src/com/itmill/toolkit/terminal/gwt/client/Util.java
index 05c915412d..20e591ff9f 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/Util.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/Util.java
@@ -6,6 +6,7 @@ package com.itmill.toolkit.terminal.gwt.client;
 
 import java.util.Iterator;
 
+import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.HasWidgets;
 import com.google.gwt.user.client.ui.Widget;
@@ -122,4 +123,17 @@ public class Util {
     }
     return false;
     }-*/;
+
+    private static final Element escapeHtmlHelper = DOM.createDiv();
+
+    /**
+     * Converts html entities to text.
+     * 
+     * @param html
+     * @return escaped string presentation of given html
+     */
+    public static String escapeHTML(String html) {
+        DOM.setInnerText(escapeHtmlHelper, html);
+        return DOM.getInnerHTML(escapeHtmlHelper);
+    }
 }
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java
index cbad27b9ec..6a60b0878f 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java
@@ -62,7 +62,7 @@ public class IFilterSelect extends Composite implements Paintable, Field,
                 sb.append(iconUri);
                 sb.append("\" alt=\"icon\" class=\"i-icon\" />");
             }
-            sb.append(caption);
+            sb.append(Util.escapeHTML(caption));
             return sb.toString();
         }