Skip to content

Commit 894d9c5

Browse files
author
Thom
committed
Change regex to allow ' (#6270)
1 parent 8bb306e commit 894d9c5

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

interface/web/mail/form/mail_user_filter.tform.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
'datatype' => 'VARCHAR',
122122
'formtype' => 'TEXT',
123123
'validators' => array ( 0 => array ( 'type' => 'REGEX',
124-
'regex' => '/^[\p{Latin}0-9\.\-\_\ \&\/]{0,100}$/u',
124+
'regex' => '/^[\p{Latin}0-9\.\'\-\_\ \&\/]{0,100}$/u',
125125
'errmsg'=> 'target_error_regex'),
126126
),
127127
'default' => '',

interface/web/mailuser/form/mail_user_filter.tform.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@
9494
'datatype' => 'VARCHAR',
9595
'formtype' => 'SELECT',
9696
'default' => '',
97-
//'value' => array('contains'=>'contains_txt','is' => 'Is','begins'=>'Begins with','ends'=>'Ends with')
9897
'value' => array('contains'=>'contains_txt', 'is'=>'is_txt', 'begins'=>'begins_with_txt', 'ends'=>'ends_with_txt', 'regex'=>'regex_txt', 'localpart'=>'localpart_txt', 'domain'=>'domain_txt')
9998
),
10099
'searchterm' => array (
@@ -122,7 +121,7 @@
122121
'datatype' => 'VARCHAR',
123122
'formtype' => 'TEXT',
124123
'validators' => array ( 0 => array ( 'type' => 'REGEX',
125-
'regex' => '/^[\p{Latin}0-9\.\-\_\ \&\/]{0,100}$/u',
124+
'regex' => '/^[\p{Latin}0-9\.\'\-\_\ \&\/]{0,100}$/u',
126125
'errmsg'=> 'target_error_regex'),
127126
),
128127
'default' => '',

0 commit comments

Comments
 (0)