Commit d0fd9d7e authored by Dan Chadwick's avatar Dan Chadwick Committed by jrockowitz
Browse files

Issue #3093873 by DanChadwick: WebformEmailMultiple validation too strict when using tokens

parent 36c16250

src/Element/WebformEmailMultiple.php

+3 −2
Changes for src/Element/WebformEmailMultiple.php: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -61,8 +61,9 @@ class WebformEmailMultiple extends FormElement { 
      $values = preg_split('/\s*,\s*/', $value);

      // Validate email.

      foreach ($values as $value) {

        // Allow tokens to be be include in multiple email list.

        if (!empty($element['#allow_tokens'] && preg_match('/^\[.*\]$/', $value))) {

        // Allow tokens to be be included in multiple email list by skipping

        // validation if a token is present.

        if (!empty($element['#allow_tokens'] && preg_match('/\[.+\]/', $value))) {

          continue;

        }

tests/src/Functional/Element/WebformElementEmailMultipleTest.php

+2 −2
Changes for tests/src/Functional/Element/WebformElementEmailMultipleTest.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -49,10 +49,10 @@ class WebformElementEmailMultipleTest extends WebformElementBrowserTestBase { 


    // Check email multiple valid token email address (via #allow_tokens).

    $edit = [

      'email_multiple_advanced' => 'example@example.com, [token]',

      'email_multiple_advanced' => 'example@example.com, [token], [token1]@[token2].com',

    ];

    $this->drupalPostForm('webform/test_element_email_multiple', $edit, t('Submit'));

    $this->assertRaw("email_multiple_advanced: 'example@example.com, [token]'");

    $this->assertRaw("email_multiple_advanced: 'example@example.com, [token], [token1]@[token2].com'");

  }



}