Merge branch 'upper-case'

dut3062796s · Nov 12, 2015 · c3ec2c3 · c3ec2c3
2 parents 7a06fe4 + fb896b6
commit c3ec2c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/core/src/main/resources/template/xhtml/form-close-validate.ftl b/core/src/main/resources/template/xhtml/form-close-validate.ftl
@@ -114,13 +114,13 @@ END SNIPPET: supported-validators
                 <#if validator.shortCircuit>continueValidation = false;</#if>
             }
             <#elseif validator.validatorType = "email">
-            if (continueValidation && fieldValue != null && fieldValue.length > 0 && fieldValue.match("${validator.regex?js_string}")==null) {
+            if (continueValidation && fieldValue != null && fieldValue.length > 0 && fieldValue.match(/${validator.regex}/i)==null) {
                 addError(field, error);
                 errors = true;
                 <#if validator.shortCircuit>continueValidation = false;</#if>
             }
             <#elseif validator.validatorType = "url">
-            if (continueValidation && fieldValue != null && fieldValue.length > 0 && fieldValue.match("/${validator.urlRegex?js_string}/i")==null) {
+            if (continueValidation && fieldValue != null && fieldValue.length > 0 && fieldValue.match(/${validator.urlRegex}/i)==null) {
                 addError(field, error);
                 errors = true;
                 <#if validator.shortCircuit>continueValidation = false;</#if>

diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java
@@ -30,6 +30,7 @@
 public class EmailValidatorTest extends XWorkTestCase {
 
     public void testEmailValidity() throws Exception {
+        assertTrue(verifyEmailValidity("[email protected]"));
         assertTrue(verifyEmailValidity("[email protected]"));
         assertTrue(verifyEmailValidityWithExpression("[email protected]", "\\b^[a-z]+@[a-z]+(\\.[a-z]+)*\\.com$\\b"));
         assertTrue(verifyEmailValidity("[email protected]"));