openutils-svn

[Openutils-svn] SF.net SVN: openutils:[3645] trunk/openutils-mgnlmessages/src/main/java/net /sourceforge/openutils/mgnlmessages/el/MessagesEl.java

[<die...@us...>]

Revision: 3645
          http://openutils.svn.sourceforge.net/openutils/?rev=3645&view=rev
Author:   diego_schivo
Date:     2011-08-26 07:41:47 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
MESSAGES-14 fix html entities test

Modified Paths:
--------------
    trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java

Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java	2011-08-26 07:38:27 UTC (rev 3644)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java	2011-08-26 07:41:47 UTC (rev 3645)
@@ -141,8 +141,8 @@
 		return StringEscapeUtils.escapeJavaScript(msg);
 	}
 	
-	public static boolean messageTextContains(String str, String searchStr)
-	{
-	    return StringUtils.containsIgnoreCase(str, searchStr);
-	}
+    public static boolean messageTextContains(String str, String searchStr)
+    {
+        return StringUtils.containsIgnoreCase(StringEscapeUtils.unescapeHtml(str), searchStr);
+    }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[3648] trunk/openutils-mgnlmessages/src/main/java/net /sourceforge/openutils/mgnlmessages/el/MessagesEl.java

[<die...@us...>]

Revision: 3648
          http://openutils.svn.sourceforge.net/openutils/?rev=3648&view=rev
Author:   diego_schivo
Date:     2011-08-26 07:50:01 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
MESSAGES-14 fix html tags test

Modified Paths:
--------------
    trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java

Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java	2011-08-26 07:46:43 UTC (rev 3647)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java	2011-08-26 07:50:01 UTC (rev 3648)
@@ -27,6 +27,8 @@
 
 import java.text.MessageFormat;
 
+import net.sourceforge.openutils.elfunctions.ElStringUtils;
+
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 
@@ -143,6 +145,8 @@
 	
     public static boolean messageTextContains(String str, String searchStr)
     {
-        return StringUtils.containsIgnoreCase(StringEscapeUtils.unescapeHtml(str), searchStr);
+        return StringUtils.containsIgnoreCase(
+            ElStringUtils.stripHtmlTags(StringEscapeUtils.unescapeHtml(str)),
+            searchStr);
     }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.